search

reanahub / reana

REANA: Reusable research data analysis platform
https://docs.reana.io
MIT License
127 stars 54 forks source link

Merge `maint-0.7` to `master` #498

Closed mvidalgarcia closed 3 years ago

mvidalgarcia commented 3 years ago

Recipe:

$ reana-dev git-upgrade -c ALL
$ reana-dev git-checkout -c ALL master
$ cd reana-ui
$ reana-dev git-upgrade -c . --base maint-0.7
$ reana-dev git-upgrade -c .
$ git checkout -b merge
$ git log master..maint-0.7  # what changes we would merge?
$ git merge --log maint-0.7  
$ git status # file1.py and file2.py have conflicts
$ vim file1.py # solve conflicts
$ git add file1.py
$ vim file2.py # solve more conflicts
$ git add file2.py
$ git status # all clean
$ git merge --continue # we are done!
$ git diff master merge # inspect all code changes
$ reana-dev run-ci ... # try to run; whoops, it's broken
$ vim file3.py # some other file may needs adaptation
$ git add file3.py
$ git commit --amend
$ git show master:file4.py > file4.py # some yet another file may be easier to edit out again from its master state
$ vim file4.py
$ git add file4.py
$ git commit --amend
$ git diff master merge # one last look
$ reana-dev run-ci ... # let's retest

---

$ git push origin merge
$ gh pr create -t "Merge branch 'maint-0.7'" -b "addresses reanahub/reana#498" --web
mvidalgarcia commented 3 years ago 
$ reana-dev git-status -c CLUSTER -c CLIENT -c reana --exclude-components r-a-vomsproxy,r-a-krb5
Excluding component(s) ['reana-auth-vomsproxy', 'reana-auth-krb5']
reana-workflow-engine-serial @ merge @ 5e01cb3 setup: upgrade requirements
reana-commons @ pr-259 @ eaec276 Merge branch 'maint-0.7'
pytest-reana @ merge @ 0587224 Merge branch 'maint-0.7'
reana-job-controller @ pr-315 @ 30e5896 setup: upgrade dependencies
reana-workflow-engine-cwl @ pr-182 @ 9f14054 setup: upgrade dependencies
reana-workflow-controller @ merge @ fb0c6ed setup: upgrade dependencies
reana-server @ merge @ 00578ef setup: upgrade dependencies
reana-workflow-engine-yadage @ pr-187 @ 5ed5974 setup: upgrade dependencies
reana-db @ merge @ 6b65cbc Merge branch 'maint-0.7'
reana-client @ merge @ 70d5bbe Merge branch 'maint-0.7'
reana @ pr-499 @ 2c5df09 Merge branch 'maint-0.7'
reana-ui @ master @ 4a381f1 ui: added new pending status support
reana-message-broker @ master @ 5704409 Merge branch 'maint-0.7'

$ reana-dev run-ci -m /var/reana:/var/reana --exclude-components=r-a-vomsproxy,r-a-krb5 --admin-email admin@cern.ch --admin-password 123456 --mode latest
...
OK
diegodelemos commented 3 years ago 
$ reana-dev git-status -c CLUSTER -c CLIENT -c reana --exclude-components r-a-vomsproxy,r-a-krb5
Excluding component(s) ['reana-auth-vomsproxy', 'reana-auth-krb5']
reana-db @ merge @ 6b65cbc Merge branch 'maint-0.7'
reana-job-controller @ merge @ 30e5896 setup: upgrade dependencies
reana-client @ merge @ 70d5bbe Merge branch 'maint-0.7'
pytest-reana @ merge @ 0587224 Merge branch 'maint-0.7'
reana-server @ merge @ 00578ef setup: upgrade dependencies
reana @ merge @ 2c5df09 Merge branch 'maint-0.7'
reana-commons @ merge @ eaec276 Merge branch 'maint-0.7'
reana-workflow-engine-yadage @ merge @ 5ed5974 setup: upgrade dependencies
reana-workflow-controller @ merge @ fb0c6ed setup: upgrade dependencies
reana-ui @ master @ 4a381f1 ui: added new pending status support
reana-message-broker @ master @ 5704409 Merge branch 'maint-0.7'
reana-workflow-engine-serial @ merge @ 5e01cb3 setup: upgrade requirements
reana-workflow-engine-cwl @ merge @ 9f14054 setup: upgrade dependencies
$ reana-dev run-ci -m /var/reana:/var/reana --exclude-components=r-a-vomsproxy,r-a-krb5 --admin-email admin@cern.ch --admin-password 123456 --mode latest
...
OK
mvidalgarcia commented 3 years ago

All merged 🎉