Skip to content

Commit

Permalink
fix: perform an atomic push when releasing
Browse files Browse the repository at this point in the history
This avoids the error " Updates were rejected because the tip of your current branch is behind its remote counterpart" when a PR is merged while release is in progress
  • Loading branch information
wagoid committed Mar 2, 2021
1 parent 7954593 commit 5410524
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
- name: Push to docker registry
run: |
docker push $DOCKER_REGISTRY_URL/wagoid/commitlint-github-action:$VERSION
- run: git push --follow-tags origin master
- run: git push --atomic --follow-tags origin master
- name: Create a git tag for the major version
run: |
major=`echo $VERSION | sed -E 's/([0-9]+)(.+)/\1/'`
Expand Down

0 comments on commit 5410524

Please sign in to comment.