search

web4bio / webgen

WebGen Vertically Integrated Project
https://web4bio.github.io/webgen/main/html/
11 stars 26 forks source link

Update development and remove release branch #421

Closed adit-anand closed 2 years ago

adit-anand commented 2 years ago

Main differences between branches are:

  1. Performing fetches one-by-one instead of in parallel to avoid CORS issues
  2. Optimizing the speed of the download functions by sorting data upstream and using additional parameters to simplify logic
  3. The addition of the Progress Bar to indicate the status of data being fetched

We can delete the release branch to simplify our workflow moving forward after this is merged.

enemeth19 commented 2 years ago

We can delete the release branch to simplify our workflow moving forward after this is merged.

I don't think we should delete the release branch because:

  1. The GitHub Pages is currently pointing to this branch, and
  2. This branch is supposed to reflect the most stable version of the app that we want to expose on GitHub pages

However, this does bring into question why the master branch is behind the release branch...

Open to additional thoughts on this from you (@19aanand) or anyone else!

adit-anand commented 2 years ago

Good point! In that case, should all changes we make should be first merged into development?

Regarding the master branch, I feel like we can merge the release branch into master and then repeat when we have a final version of the release branch. Feel free to bring up another approach if one comes to mind.

enemeth19 commented 2 years ago

should all changes we make should be first merged into development

Yes, like this: image

Regarding the master branch, I feel like we can merge the release branch into master and then repeat when we have a final version of the release branch

I agree