diff --git a/.github/workflows/weblate_auto_merge.yaml b/.github/workflows/weblate_auto_merge.yaml index 7df0b8eaf..8fd068c42 100644 --- a/.github/workflows/weblate_auto_merge.yaml +++ b/.github/workflows/weblate_auto_merge.yaml @@ -4,17 +4,22 @@ on: pull_request: types: [opened, reopened] +permissions: + contents: write + pull-requests: write + jobs: automerge: runs-on: ubuntu-latest - permissions: - contents: write - pull-requests: write if: github.actor == 'weblate' steps: - - name: Checkout Repository - uses: actions/checkout@v4 - - name: Enable Pull Request Automerge - run: gh pr merge --merge --auto "1" + - name: Approve + run: gh pr review --approve "$PR_URL" + env: + PR_URL: ${{github.event.pull_request.html_url}} + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} + - name: Enable auto-merge + run: gh pr merge --auto --rebase "$PR_URL" env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + PR_URL: ${{github.event.pull_request.html_url}} + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} \ No newline at end of file