From 4ab36ebbe9c6316ada37d48d46ad37908af03fe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Sun, 7 Feb 2021 18:33:14 +0000 Subject: [PATCH] feat(ci): use pascalgn/automerge-action to automerge PRs (#2738) --- .github/workflows/automerge.yml | 37 +++++++++++++++++ .../{maintenance.yml => go-maintenance.yml} | 35 +--------------- .github/workflows/go-version.yml | 1 + .github/workflows/node-maintenance.yml | 41 +++++++++++++++++++ .github/workflows/node-version.yml | 1 + .github/workflows/openapi.yml | 1 + 6 files changed, 82 insertions(+), 34 deletions(-) create mode 100644 .github/workflows/automerge.yml rename .github/workflows/{maintenance.yml => go-maintenance.yml} (51%) create mode 100644 .github/workflows/node-maintenance.yml diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml new file mode 100644 index 000000000..a213c9e1e --- /dev/null +++ b/.github/workflows/automerge.yml @@ -0,0 +1,37 @@ +name: Automerge + +on: + pull_request: + branches: + - main + types: + - labeled + - unlabeled + - synchronize + - opened + - edited + - ready_for_review + - reopened + - unlocked + pull_request_review: + types: + - submitted + check_suite: + types: + - completed + +jobs: + automerge: + runs-on: ubuntu-latest + steps: + - name: automerge + uses: "pascalgn/automerge-action@v0.13.0" + env: + GITHUB_TOKEN: "${{ secrets.GITHUB_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/maintenance.yml b/.github/workflows/go-maintenance.yml similarity index 51% rename from .github/workflows/maintenance.yml rename to .github/workflows/go-maintenance.yml index 6cb1d0adc..da200e0e5 100644 --- a/.github/workflows/maintenance.yml +++ b/.github/workflows/go-maintenance.yml @@ -5,40 +5,6 @@ on: - cron: "0 20 * * 1" jobs: - npm-upgrades: - name: Regenerate package-lock.json - runs-on: macos-latest - steps: - - name: Check out code - uses: actions/checkout@v2 - - - name: Set up Node JS - uses: actions/setup-node@v2 - with: - node-version: 14.15.4 - - - name: Regenerate package-lock.json - run: make -C ui npm-upgrade - - - name: Rebuild react app - run: make -C ui build - - - name: Create Pull Request - id: cpr - uses: peter-evans/create-pull-request@v3.8.0 - with: - token: ${{ secrets.GH_REPO_TOKEN }} - author: "Łukasz Mierzwa " - commit-message: "chore(ui): upgrade all 3rd party dependencies" - branch: npm-upgrades - delete-branch: true - title: "chore(ui): upgrade all 3rd party dependencies" - - - name: Check outputs - run: | - echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}" - echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}" - go-mod-upgrades: name: Upgrade all Go modules runs-on: ubuntu-latest @@ -70,6 +36,7 @@ jobs: branch: go-mod-upgrades delete-branch: true title: "chore(backend): upgrade all Go modules" + labels: automerge - name: Check outputs run: | diff --git a/.github/workflows/go-version.yml b/.github/workflows/go-version.yml index dfdedc980..964bc29e3 100644 --- a/.github/workflows/go-version.yml +++ b/.github/workflows/go-version.yml @@ -33,6 +33,7 @@ jobs: branch: version-sync-go delete-branch: true title: "chore(actions): use latest Go version" + labels: automerge - name: Check outputs run: | diff --git a/.github/workflows/node-maintenance.yml b/.github/workflows/node-maintenance.yml new file mode 100644 index 000000000..a8dc75a81 --- /dev/null +++ b/.github/workflows/node-maintenance.yml @@ -0,0 +1,41 @@ +name: Maintenance + +on: + schedule: + - cron: "0 20 * * 0" + +jobs: + npm-upgrades: + name: Regenerate package-lock.json + runs-on: macos-latest + steps: + - name: Check out code + uses: actions/checkout@v2 + + - name: Set up Node JS + uses: actions/setup-node@v2 + with: + node-version: 14.15.4 + + - name: Regenerate package-lock.json + run: make -C ui npm-upgrade + + - name: Rebuild react app + run: make -C ui build + + - name: Create Pull Request + id: cpr + uses: peter-evans/create-pull-request@v3.8.0 + with: + token: ${{ secrets.GH_REPO_TOKEN }} + author: "Łukasz Mierzwa " + commit-message: "chore(ui): upgrade all 3rd party dependencies" + 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 }}" diff --git a/.github/workflows/node-version.yml b/.github/workflows/node-version.yml index d73dee030..43e21a336 100644 --- a/.github/workflows/node-version.yml +++ b/.github/workflows/node-version.yml @@ -34,6 +34,7 @@ jobs: branch: version-sync-node delete-branch: true title: "chore(actions): use latest Node version" + labels: automerge - name: Check outputs run: | diff --git a/.github/workflows/openapi.yml b/.github/workflows/openapi.yml index b883143a3..8ac84169d 100644 --- a/.github/workflows/openapi.yml +++ b/.github/workflows/openapi.yml @@ -28,6 +28,7 @@ jobs: branch: openapi-sync delete-branch: true title: "chore(backend): regenerate openapi code" + labels: automerge - name: Check outputs run: |