fix: repo-ansible workflow #8309

linkorb · Dec 28, 2023 · 335d6e9 · 335d6e9
1 parent 0f05f02
commit 335d6e9
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/.github/workflows/repo-ansible.yaml b/.github/workflows/repo-ansible.yaml
@@ -1,6 +1,8 @@
 name: repo-ansible
 
 on:
+  workflow_dispatch:
+
   pull_request_target:
     paths:
       - 'repo.yaml'
@@ -23,10 +25,16 @@ jobs:
   run:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - if: ${{ env.IS_PULL_REQUEST == '0' }}
+        uses: actions/checkout@v4
         with:
           path: current
-          ref: ${{ github.event_name == 'pull_request_target' && github.head_ref || '' }}
+
+      - if: ${{ env.IS_PULL_REQUEST == '1' }}
+        uses: actions/checkout@v4
+        with:
+          path: current
+          ref: refs/pull/${{ github.event.pull_request.number }}/merge
 
       - uses: actions/checkout@v4
         with:
@@ -67,8 +75,9 @@ jobs:
           git config user.name github-actions
           git config user.email github-actions@github.com
           git add .
-          git commit -m "chore: repo-ansible run"
-          git push
+          if git commit -m "chore: repo-ansible run"; then
+            git push
+          fi
 
 
       - if: ${{ env.IS_PULL_REQUEST == '1' && env.REPOSITORY_CHANGED == '1' }}