From 7c57c9a7789e887117da4c4a7a003afee79e5dd2 Mon Sep 17 00:00:00 2001 From: andrewcole Date: Fri, 29 Dec 2023 00:15:22 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=94=84=20synced=20local=20'.'=20with?= =?UTF-8?q?=20remote=20'templates/common/'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index da8d76d..4e2771b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2022 Andrew Cole +Copyright (c) 2024 Andrew Cole. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 0f34218c72e9d4bf465dc7e7525436b8122f88f8 Mon Sep 17 00:00:00 2001 From: andrewcole Date: Fri, 29 Dec 2023 00:15:22 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=94=84=20synced=20local=20'.'=20with?= =?UTF-8?q?=20remote=20'templates/docker/'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/auto-merge-pull-request.yaml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/auto-merge-pull-request.yaml b/.github/workflows/auto-merge-pull-request.yaml index 59fd257..8512176 100644 --- a/.github/workflows/auto-merge-pull-request.yaml +++ b/.github/workflows/auto-merge-pull-request.yaml @@ -4,16 +4,15 @@ jobs: concurrency: cancel-in-progress: true group: ${{ github.workflow }}-${{ github.ref }} + if: contains(github.event.pull_request.labels.*.name, 'automerge') runs-on: ubuntu-latest steps: - - env: - GITHUB_TOKEN: ${{ secrets.PAT }} - MERGE_DELETE_BRANCH: "true" - MERGE_FORKS: "false" - MERGE_RETRIES: "720" - id: automerge + - id: automerge name: Auto Merge - uses: pascalgn/automerge-action@v0.15.6 + uses: alexwilson/enable-github-automerge-action@main + with: + github-token: ${{ secrets.PAT }} + merge-method: MERGE name: Automatically Merge Pull Requests on: check_suite: