Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/releaseCheck #133

Merged
merged 2 commits into from
Jul 10, 2018
Merged

Feat/releaseCheck #133

merged 2 commits into from
Jul 10, 2018

Conversation

BenjaSanchez
Copy link
Contributor

Main improvements in this PR:

In our workflow, for each new release there is an extra commit named chore: new version in which version/history/binaries are updated. However, sometimes some other files also change due to e.g. an update of some dependency by the admin between the moment of the PR in devel and the release in master. This then leads to conflicts as soon as those files change in devel later, producing extra undesired commits in master.

With this PR, increaseVersion.m will work if only 2 files change after saveYeastModel.m has updated the model: history.md and 1 line in yeastGEM.xml (the line that specifies the model's version). It does so by parsing the output of git diff --numstat (details of the git command here). If more changes are found, the function will error, prompting the admin to first update devel, make a new PR, and then do the release.

I hereby confirm that I have:

  • Tested my code with all requirements for running the model
  • Selected devel as a target branch (top left drop-down menu)
  • If needed, asked first in the Gitter chat room about this PR

the field in which the version is stored was changed
the only files that can change are 'history.md' and 'yeastGEM.xml' (and the latter in only one line)
@BenjaSanchez BenjaSanchez added the enhancement new field/feature label Jul 9, 2018
@BenjaSanchez BenjaSanchez self-assigned this Jul 9, 2018
@BenjaSanchez BenjaSanchez requested a review from edkerk July 9, 2018 13:07
@BenjaSanchez BenjaSanchez merged commit b851173 into devel Jul 10, 2018
@BenjaSanchez BenjaSanchez mentioned this pull request Jul 13, 2018
@BenjaSanchez BenjaSanchez deleted the feat/releaseCheck branch July 20, 2018 13:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement new field/feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants