From 981b5cb0127532ec149f6e2fb6f335c7279cd15a Mon Sep 17 00:00:00 2001 From: Andrew Eisenberg Date: Mon, 31 May 2021 10:08:10 -0700 Subject: [PATCH] Fix the mergeback workflow We need to tag and mergeback if the tag does _not_ already exist. --- .github/workflows/post-release-mergeback.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/post-release-mergeback.yml b/.github/workflows/post-release-mergeback.yml index 05aad769d..70d684086 100644 --- a/.github/workflows/post-release-mergeback.yml +++ b/.github/workflows/post-release-mergeback.yml @@ -83,7 +83,7 @@ jobs: # commit that actually makes it to the release branch is a merge commit, # and not yet known during the first workflow. We tag now because we know the correct commit. - name: Tag release - if: steps.check.outputs.exists == 'true' + if: steps.check.outputs.exists != 'true' env: VERSION: ${{ steps.getVersion.outputs.version }} run: | @@ -91,7 +91,7 @@ jobs: git push origin --follow-tags "$VERSION" - name: Create mergeback branch - if: steps.check.outputs.exists == 'true' + if: steps.check.outputs.exists != 'true' env: VERSION: "${{ steps.getVersion.outputs.version }}" NEW_BRANCH: "${{ steps.getVersion.outputs.newBranch }}"