From 9d00d1e75718143215dbf95c9c12956c56225e90 Mon Sep 17 00:00:00 2001 From: Wagner Santos <7467450+wagoid@users.noreply.github.com> Date: Tue, 2 Mar 2021 18:14:34 -0300 Subject: [PATCH] fix: perform an atomic push when releasing This avoids the following error: "Updates were rejected because the tip of your current branch is behind its remote counterpart" This happens when a PR is merged while release is in progress. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 24f6f159..04a631ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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/'`