Test

cPu1 · Aug 21, 2023 · b55359d · b55359d
1 parent 03cffdd
commit b55359d
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/.github/workflows/release-merge.yaml b/.github/workflows/release-merge.yaml
@@ -1,4 +1,5 @@
 name: Merge release changes to main
+workflow_dispatch: {}
 on:
   push:
     branches:
@@ -22,7 +23,10 @@ jobs:
         run: |
           git checkout $DEFAULT_BRANCH
           git checkout -b merge-${{ github.sha }}
-          git merge --no-commit --no-ff ${{ github.ref }}
+          if [ "$(git merge --no-commit --no-ff ${{ github.ref }})" = "Already up to date." ]; then
+            echo "Exiting";
+            exit 0;
+          fi
           git checkout ORIG_HEAD -- $VERSION_FILE
           git add $VERSION_FILE
           EDITOR=true git merge --continue