Test

cPu1 · Aug 21, 2023 · 26dd422 · 26dd422
1 parent 16a6b8e
commit 26dd422
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/.github/workflows/release-merge2.yaml b/.github/workflows/release-merge2.yaml
@@ -17,11 +17,13 @@ jobs:
         with:
           token: "${{ secrets.GITHUB_TOKEN }}"
       - name: Merge release branch into ${{env.DEFAULT_BRANCH}}
+        id: merge-changes
         run: |
           git checkout $DEFAULT_BRANCH
           git checkout -b merge-${{ github.sha }}
           if [ "$(git merge --no-commit --no-ff ${{ github.ref }})" = "Already up to date." ]; then
             echo "Exiting";
+            echo "changes=false" >> $GITHUB_OUTPUT
             exit 0;
           fi
           git checkout ORIG_HEAD -- $VERSION_FILE
@@ -31,6 +33,7 @@ jobs:
           git push --set-upstream origin HEAD
       - uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 #v6.4.1
         name: Open PR to ${{env.DEFAULT_BRANCH}}
+        if: steps.merge-changes.outputs.changes != 'false'
         with:
           github-token: ${{ secrets.EKSCTLBOT_TOKEN }}
           script: |