chore: Sync with WeblateOrg/meta

WeblateOrg · Nov 7, 2024 · 7ac4529 · 7ac4529
1 parent 2ca04f7
commit 7ac4529
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/.github/workflows/pull_requests.yaml b/.github/workflows/pull_requests.yaml
@@ -22,7 +22,7 @@ jobs:
     name: Weblate automerge
     if: github.actor == 'weblate'
     steps:
-    - uses: peter-evans/enable-pull-request-automerge@v3
-      with:
-        pull-request-number: ${{ github.event.pull_request.number }}
-        merge-method: rebase
+    - name: Enable Pull Request Automerge
+      run: gh pr merge --merge --auto "${{ github.event.pull_request.number }}"
+      env:
+        GH_TOKEN: ${{ secrets.WEBLATE_CI_TOKEN }}
diff --git a/.github/workflows/yarn-update.yml b/.github/workflows/yarn-update.yml
@@ -25,9 +25,6 @@ permissions:
 jobs:
   yarn-update:
     runs-on: ubuntu-24.04
-    permissions:
-      contents: write
-      pull-requests: write
 
     steps:
     - uses: actions/checkout@v4