chore: update

taiga-family · Oct 5, 2023 · 5b859de · 5b859de
1 parent ea4a1c5
commit 5b859de
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml
@@ -13,7 +13,6 @@ jobs:
       - uses: taiga-family/ci/actions/setup/[email protected]
       - uses: taiga-family/ci/actions/setup/[email protected]
       - id: matrix
-        if: env.TAIGA_FAMILY_BOT_IS_AUTHOR == 'true'
         run: echo "value=$JOBS_NAME" >> $GITHUB_OUTPUT
 
   wait:
@@ -33,13 +32,15 @@ jobs:
     needs: [wait]
     runs-on: ubuntu-latest
     steps:
+      - uses: taiga-family/ci/actions/setup/[email protected]
       - uses: taiga-family/ci/actions/auto/approve/[email protected]
         with:
           token1: ${{ secrets.GITHUB_TOKEN }}
           token2: ${{ secrets.TAIGA_FAMILY_APPROVE_BOT_PAT }}
-      - uses: taiga-family/ci/actions/run/[email protected]
-        with:
-          token: ${{ secrets.TAIGA_FAMILY_APPROVE_BOT_PAT }}
+      - name: Enable Pull Request Automerge
+        run: gh pr merge --merge --auto "${{ github.event.number }}"
+        env:
+          GH_TOKEN: ${{ secrets.TAIGA_FAMILY_APPROVE_BOT_PAT }}
 
 concurrency:
   group: auto-approve-${{ github.head_ref }}