fix: Fix rollback by git revert

yeha98555 · Jun 17, 2023 · c2ed013 · c2ed013
1 parent 7824f57
commit c2ed013
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/.github/workflows/render.yml b/.github/workflows/render.yml
@@ -3,8 +3,7 @@ name: Deploy to Render
 on:
   push:
     branches:
-      - main
-      - develop
+      - fix/github-actions-rollback
 
 jobs:
   test:
@@ -31,7 +30,8 @@ jobs:
       - name: Rollback
         if: ${{ failure() && github.event_name == 'push' }}
         run: |
-          git checkout ${{ github.sha }}^1
+          MERGE_COMMIT_SHA=$(git log --merges --pretty=format:"%H" -1)
+          git revert -m 1 $MERGE_COMMIT_SHA
           git push --force
 
           # Post a comment on the pull request