From aa64cf898f0bf89473965e1274247f900c368904 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Tue, 23 Nov 2021 19:15:31 +0100 Subject: [PATCH] ci: enable automerge for generated PRs Signed-off-by: Jens Langhammer --- .github/workflows/translation-compile.yml | 9 +++++++++ .github/workflows/web-api-publish.yml | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/.github/workflows/translation-compile.yml b/.github/workflows/translation-compile.yml index 7dd64eb43..dc7f7fa5d 100644 --- a/.github/workflows/translation-compile.yml +++ b/.github/workflows/translation-compile.yml @@ -37,10 +37,19 @@ jobs: run: pipenv run ./manage.py compilemessages - name: Create Pull Request uses: peter-evans/create-pull-request@v3 + id: cpr with: token: ${{ secrets.GITHUB_TOKEN }} branch: compile-backend-translation commit-message: "core: compile backend translations" title: "core: compile backend translations" + body: "core: compile backend translations" delete-branch: true signoff: true + - name: Enable Pull Request Automerge + if: steps.cpr.outputs.pull-request-operation == 'created' + uses: peter-evans/enable-pull-request-automerge@v1 + with: + token: ${{ secrets.GITHUB_TOKEN }} + pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} + merge-method: squash diff --git a/.github/workflows/web-api-publish.yml b/.github/workflows/web-api-publish.yml index 25ac5e6f6..78d2e384a 100644 --- a/.github/workflows/web-api-publish.yml +++ b/.github/workflows/web-api-publish.yml @@ -30,10 +30,19 @@ jobs: npm i @goauthentik/api@$VERSION - name: Create Pull Request uses: peter-evans/create-pull-request@v3 + id: cpr with: token: ${{ secrets.GITHUB_TOKEN }} branch: update-web-api-client commit-message: "web: Update Web API Client version" title: "web: Update Web API Client version" + body: "web: Update Web API Client version" delete-branch: true signoff: true + - name: Enable Pull Request Automerge + if: steps.cpr.outputs.pull-request-operation == 'created' + uses: peter-evans/enable-pull-request-automerge@v1 + with: + token: ${{ secrets.GITHUB_TOKEN }} + pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} + merge-method: squash