Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 indevel
and the release inmaster
. This then leads to conflicts as soon as those files change indevel
later, producing extra undesired commits inmaster
.With this PR,
increaseVersion.m
will work if only 2 files change aftersaveYeastModel.m
has updated the model:history.md
and 1 line inyeastGEM.xml
(the line that specifies the model's version). It does so by parsing the output ofgit diff --numstat
(details of the git command here). If more changes are found, the function will error, prompting the admin to first updatedevel
, make a new PR, and then do the release.I hereby confirm that I have:
devel
as a target branch (top left drop-down menu)