-
Notifications
You must be signed in to change notification settings - Fork 18
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
Fix force push to develop on master hotfixes #930
Conversation
569aed1
to
7f10958
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, just check if the push force permission is only on the @niaefeup-admin account on the develop branch
We should discuss some changes that must be done by fixes to master
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I dismissed the review, because I have some further thoughts into this to make fixes into master simpler. Also maybe we should look into not bumping the minor version on master
if the push doesn't come from develop
, and instead bump the patch version.
git fetch origin develop | ||
if [[ $(git diff --quiet HEAD~1 origin/develop) ]]; then | ||
echo "Master version does not match develop version" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe if the master
does not match the develop
branch, we should create automatically create a PR to accommodate such fixes to the develop
branch
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In this way we can adopt the fix workflow that we discussed in the past Thursday meeting:
- Make fix on the master branch
- Make a PR into the master branch
- Upon merging, the action will automatically create a PR to merge this changes into develop
- If necessary, do some fixes to work in the develop branch
- Upon approval, merge into develop
I think this is the most streamlined and error-free approach into getting fixes done in master
but also in develop
.
Maybe this should be a seperate action workflow, and maybe done on a seperate issue, that listens to merged pull request events into `master, wdyt?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, we can create a separate workflow listening for merged pull requests to master or simply pushes, that compares to develop and finds if it needs backporting. I think that should go on another issue since it is not related to this hotfix.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With that said, maybe you should change the base of this PR to master
and not to develop
😅
Just to be consistent with this workflow, from now on.
7f10958
to
e21a273
Compare
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## master #930 +/- ##
=====================================
Coverage 23% 23%
=====================================
Files 143 143
Lines 4351 4351
=====================================
Hits 959 959
Misses 3392 3392 |
Review checklist
whatsnew/whatsnew-pt-PT
changelog.md
with the change