From ea131add02dcce207596a4578fabbfdce5f8aa05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Sun, 10 Oct 2021 19:40:09 +0100 Subject: [PATCH] feat(ci): use evans/enable-pull-request-automerge --- .github/workflows/automerge.yml | 21 --------------------- .github/workflows/go-maintenance.yml | 9 ++++++++- .github/workflows/go-mod-tidy.yml | 9 ++++++++- .github/workflows/go-version.yml | 9 ++++++++- .github/workflows/node-maintenance.yml | 9 ++++++++- .github/workflows/node-npm-audit.yml | 9 ++++++++- .github/workflows/node-version.yml | 9 ++++++++- .github/workflows/openapi.yml | 9 ++++++++- 8 files changed, 56 insertions(+), 28 deletions(-) delete mode 100644 .github/workflows/automerge.yml diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml deleted file mode 100644 index 8215ce78b..000000000 --- a/.github/workflows/automerge.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Automerge - -on: - status: {} - -jobs: - automerge: - runs-on: ubuntu-20.04 - steps: - - name: automerge - if: github.event.context == 'Mergeable' - uses: "pascalgn/automerge-action@v0.13.0" - env: - GITHUB_TOKEN: "${{ secrets.GH_REPO_TOKEN }}" - MERGE_LABELS: "automerge,!WIP" - MERGE_REMOVE_LABELS: "automerge" - MERGE_METHOD: "squash" - MERGE_FORKS: "false" - MERGE_DELETE_BRANCH: "true" - UPDATE_LABELS: "automerge,!WIP" - UPDATE_METHOD: "rebase" diff --git a/.github/workflows/go-maintenance.yml b/.github/workflows/go-maintenance.yml index e16e0ae7d..b80b26a6c 100644 --- a/.github/workflows/go-maintenance.yml +++ b/.github/workflows/go-maintenance.yml @@ -36,9 +36,16 @@ jobs: branch: go-mod-upgrades delete-branch: true title: "chore(backend): upgrade all Go modules" - labels: automerge - name: Check outputs run: | echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}" echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}" + + - name: Enable Pull Request Automerge + if: steps.cpr.outputs.pull-request-operation == 'created' + uses: peter-evans/enable-pull-request-automerge@v1.1.0 + with: + token: ${{ secrets.GH_REPO_TOKEN }} + pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} + merge-method: rebase diff --git a/.github/workflows/go-mod-tidy.yml b/.github/workflows/go-mod-tidy.yml index 6a4b62d4d..d27845644 100644 --- a/.github/workflows/go-mod-tidy.yml +++ b/.github/workflows/go-mod-tidy.yml @@ -38,9 +38,16 @@ jobs: branch: go-mod-tidy delete-branch: true title: "fix(deps): run go mod tidy" - labels: automerge - name: Check outputs run: | echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}" echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}" + + - name: Enable Pull Request Automerge + if: steps.cpr.outputs.pull-request-operation == 'created' + uses: peter-evans/enable-pull-request-automerge@v1.1.0 + with: + token: ${{ secrets.GH_REPO_TOKEN }} + pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} + merge-method: rebase diff --git a/.github/workflows/go-version.yml b/.github/workflows/go-version.yml index eb5be8138..9798afb84 100644 --- a/.github/workflows/go-version.yml +++ b/.github/workflows/go-version.yml @@ -33,9 +33,16 @@ jobs: branch: version-sync-go delete-branch: true title: "chore(actions): use latest Go version" - labels: automerge - name: Check outputs run: | echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}" echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}" + + - name: Enable Pull Request Automerge + if: steps.cpr.outputs.pull-request-operation == 'created' + uses: peter-evans/enable-pull-request-automerge@v1.1.0 + with: + token: ${{ secrets.GH_REPO_TOKEN }} + pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} + merge-method: rebase diff --git a/.github/workflows/node-maintenance.yml b/.github/workflows/node-maintenance.yml index d08b0929b..fd42e7c99 100644 --- a/.github/workflows/node-maintenance.yml +++ b/.github/workflows/node-maintenance.yml @@ -33,9 +33,16 @@ jobs: branch: npm-upgrades delete-branch: true title: "chore(ui): upgrade all 3rd party dependencies" - labels: automerge - name: Check outputs run: | echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}" echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}" + + - name: Enable Pull Request Automerge + if: steps.cpr.outputs.pull-request-operation == 'created' + uses: peter-evans/enable-pull-request-automerge@v1.1.0 + with: + token: ${{ secrets.GH_REPO_TOKEN }} + pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} + merge-method: rebase diff --git a/.github/workflows/node-npm-audit.yml b/.github/workflows/node-npm-audit.yml index d90383de4..9d466f20f 100644 --- a/.github/workflows/node-npm-audit.yml +++ b/.github/workflows/node-npm-audit.yml @@ -33,9 +33,16 @@ jobs: branch: npm-upgrades delete-branch: true title: "chore(ui): upgrade all 3rd party dependencies" - labels: automerge - name: Check outputs run: | echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}" echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}" + + - name: Enable Pull Request Automerge + if: steps.cpr.outputs.pull-request-operation == 'created' + uses: peter-evans/enable-pull-request-automerge@v1.1.0 + with: + token: ${{ secrets.GH_REPO_TOKEN }} + pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} + merge-method: rebase diff --git a/.github/workflows/node-version.yml b/.github/workflows/node-version.yml index 148474342..5da880691 100644 --- a/.github/workflows/node-version.yml +++ b/.github/workflows/node-version.yml @@ -34,9 +34,16 @@ jobs: branch: version-sync-node delete-branch: true title: "chore(actions): use latest Node version" - labels: automerge - name: Check outputs run: | echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}" echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}" + + - name: Enable Pull Request Automerge + if: steps.cpr.outputs.pull-request-operation == 'created' + uses: peter-evans/enable-pull-request-automerge@v1.1.0 + with: + token: ${{ secrets.GH_REPO_TOKEN }} + pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} + merge-method: rebase diff --git a/.github/workflows/openapi.yml b/.github/workflows/openapi.yml index 384e218ef..ba6b9fde8 100644 --- a/.github/workflows/openapi.yml +++ b/.github/workflows/openapi.yml @@ -28,9 +28,16 @@ jobs: branch: openapi-sync delete-branch: true title: "chore(backend): regenerate openapi code" - labels: automerge - name: Check outputs run: | echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}" echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}" + + - name: Enable Pull Request Automerge + if: steps.cpr.outputs.pull-request-operation == 'created' + uses: peter-evans/enable-pull-request-automerge@v1.1.0 + with: + token: ${{ secrets.GH_REPO_TOKEN }} + pull-request-number: ${{ steps.cpr.outputs.pull-request-number }} + merge-method: rebase