From 7c771cf8c71a12299074f152095f335a3dc7092f Mon Sep 17 00:00:00 2001 From: Ignasi Fosch Date: Mon, 23 Oct 2023 14:30:36 +0200 Subject: [PATCH 01/17] Create automerge.yml to replace action-wip-blocker.yml --- .github/workflows/automerge.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/automerge.yml diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml new file mode 100644 index 0000000..ef40abe --- /dev/null +++ b/.github/workflows/automerge.yml @@ -0,0 +1,29 @@ +name: automerge +on: + pull_request: + types: + - labeled + - unlabeled + - synchronize + - opened + - edited + - ready_for_review + - reopened + - unlocked + pull_request_review: + types: + - submitted + check_suite: + types: + - completed + status: {} +jobs: + automerge: + runs-on: ubuntu-latest + steps: + - id: automerge + name: automerge + uses: "pascalgn/automerge-action@v0.15.6" + env: + MERGE_LABELS: "!wip,!Block" + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" From 8e6dee98dceaf8064526b8f5d6685549b9b46e7a Mon Sep 17 00:00:00 2001 From: Ignasi Fosch Date: Mon, 23 Oct 2023 14:33:16 +0200 Subject: [PATCH 02/17] Delete .github/workflows/action-wip-blocker.yml --- .github/workflows/action-wip-blocker.yml | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 .github/workflows/action-wip-blocker.yml diff --git a/.github/workflows/action-wip-blocker.yml b/.github/workflows/action-wip-blocker.yml deleted file mode 100644 index fffc0e7..0000000 --- a/.github/workflows/action-wip-blocker.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: Automerge Blocker - -on: - pull_request: - types: [labeled, unlabeled, edited, opened, synchronize, reopened] - -jobs: - check_wip: - runs-on: ubuntu-latest - steps: - - name: Block if WIP PR - uses: ParanoidBeing/action-wip-blocker@v0.1.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - BLOCK_LIST: "WIP|do not merge|backend not live|Block|block" From eb9fd6f7d404a6e6b36e20f4939918c8ab07c1e0 Mon Sep 17 00:00:00 2001 From: Ignasi Fosch Date: Mon, 23 Oct 2023 14:30:36 +0200 Subject: [PATCH 03/17] Create automerge.yml to replace action-wip-blocker.yml --- .github/workflows/automerge.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/automerge.yml diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml new file mode 100644 index 0000000..ef40abe --- /dev/null +++ b/.github/workflows/automerge.yml @@ -0,0 +1,29 @@ +name: automerge +on: + pull_request: + types: + - labeled + - unlabeled + - synchronize + - opened + - edited + - ready_for_review + - reopened + - unlocked + pull_request_review: + types: + - submitted + check_suite: + types: + - completed + status: {} +jobs: + automerge: + runs-on: ubuntu-latest + steps: + - id: automerge + name: automerge + uses: "pascalgn/automerge-action@v0.15.6" + env: + MERGE_LABELS: "!wip,!Block" + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" From d7c6d3272e7bd2c8daf9688c493976dd6e18c827 Mon Sep 17 00:00:00 2001 From: Ignasi Fosch Date: Mon, 23 Oct 2023 14:33:16 +0200 Subject: [PATCH 04/17] Delete .github/workflows/action-wip-blocker.yml --- .github/workflows/action-wip-blocker.yml | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 .github/workflows/action-wip-blocker.yml diff --git a/.github/workflows/action-wip-blocker.yml b/.github/workflows/action-wip-blocker.yml deleted file mode 100644 index fffc0e7..0000000 --- a/.github/workflows/action-wip-blocker.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: Automerge Blocker - -on: - pull_request: - types: [labeled, unlabeled, edited, opened, synchronize, reopened] - -jobs: - check_wip: - runs-on: ubuntu-latest - steps: - - name: Block if WIP PR - uses: ParanoidBeing/action-wip-blocker@v0.1.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - BLOCK_LIST: "WIP|do not merge|backend not live|Block|block" From adbef78e42b2eaabce866750ad8f22c3a117ead9 Mon Sep 17 00:00:00 2001 From: Ignasi Fosch Date: Mon, 23 Oct 2023 15:04:19 +0200 Subject: [PATCH 05/17] Update automerge.yml --- .github/workflows/automerge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index ef40abe..52cfb74 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -26,4 +26,4 @@ jobs: uses: "pascalgn/automerge-action@v0.15.6" env: MERGE_LABELS: "!wip,!Block" - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + GITHUB_TOKEN: "${{ secrets.AUTOMERGE_TOKEN }}" From 8c8e0a6636950dbf0c22d5d918a2758e7e75d28c Mon Sep 17 00:00:00 2001 From: Ignasi Fosch Date: Mon, 23 Oct 2023 15:07:36 +0200 Subject: [PATCH 06/17] Enable automerge.yml logging --- .github/workflows/automerge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 52cfb74..95c1d23 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -27,3 +27,4 @@ jobs: env: MERGE_LABELS: "!wip,!Block" GITHUB_TOKEN: "${{ secrets.AUTOMERGE_TOKEN }}" + LOG: "DEBUG" From 4b23ef3fab6c5f65245f0a73091165f2d79cc5b6 Mon Sep 17 00:00:00 2001 From: Ignasi Fosch Date: Mon, 23 Oct 2023 15:51:00 +0200 Subject: [PATCH 07/17] Update automerge.yml --- .github/workflows/automerge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 95c1d23..03069d2 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -26,5 +26,5 @@ jobs: uses: "pascalgn/automerge-action@v0.15.6" env: MERGE_LABELS: "!wip,!Block" - GITHUB_TOKEN: "${{ secrets.AUTOMERGE_TOKEN }}" + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" LOG: "DEBUG" From 850a710f1da6633aecced0b430bda5801f3d69dc Mon Sep 17 00:00:00 2001 From: Ignasi Fosch Date: Mon, 23 Oct 2023 15:55:06 +0200 Subject: [PATCH 08/17] Add permissions to automerge.yml --- .github/workflows/automerge.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 03069d2..c024334 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -17,6 +17,13 @@ on: types: - completed status: {} + +permissions: + pull-requests: write + contents: write + issues: write + repository-projects: read + jobs: automerge: runs-on: ubuntu-latest From 0f916ce85ff0ae04193a3a254f373c7c5f91d6ed Mon Sep 17 00:00:00 2001 From: Ignasi Fosch Date: Mon, 23 Oct 2023 15:57:26 +0200 Subject: [PATCH 09/17] Change merge method in automerge.yml --- .github/workflows/automerge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index c024334..680c57d 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -33,5 +33,6 @@ jobs: uses: "pascalgn/automerge-action@v0.15.6" env: MERGE_LABELS: "!wip,!Block" + MERGE_METHOD: "rebase" GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" LOG: "DEBUG" From 46810acaf927dbc477682f56226bd953d071a446 Mon Sep 17 00:00:00 2001 From: Ignasi Fosch Date: Mon, 23 Oct 2023 16:04:23 +0200 Subject: [PATCH 10/17] Test no MERGE_LABELS --- .github/workflows/automerge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 1c5f144..b5f0b3d 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -32,6 +32,6 @@ jobs: name: automerge uses: "pascalgn/automerge-action@v0.15.6" env: - MERGE_LABELS: "!wip,!Block" + MERGE_LABELS: "" MERGE_METHOD: "rebase" GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" From 86d470da64eafdf92cc142a40af67d2558cbe922 Mon Sep 17 00:00:00 2001 From: Ignasi Fosch Date: Mon, 23 Oct 2023 16:10:21 +0200 Subject: [PATCH 11/17] Test with denied merge_label automerge.yml --- .github/workflows/automerge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index b5f0b3d..7211e14 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -32,6 +32,6 @@ jobs: name: automerge uses: "pascalgn/automerge-action@v0.15.6" env: - MERGE_LABELS: "" + MERGE_LABELS: "!x" MERGE_METHOD: "rebase" GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" From 0f82db6a0442bb94f5774b2a0e32e8b3506e2d71 Mon Sep 17 00:00:00 2001 From: Ignasi Fosch Date: Mon, 23 Oct 2023 16:19:57 +0200 Subject: [PATCH 12/17] Try automerge.yml negating default label --- .github/workflows/automerge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 7211e14..e6fc131 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -32,6 +32,6 @@ jobs: name: automerge uses: "pascalgn/automerge-action@v0.15.6" env: - MERGE_LABELS: "!x" + MERGE_LABELS: "!automerge" MERGE_METHOD: "rebase" GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" From 7028453f07ae918927e4e9d04691d55aff5b695f Mon Sep 17 00:00:00 2001 From: Ignasi Fosch Date: Mon, 23 Oct 2023 16:22:38 +0200 Subject: [PATCH 13/17] Try another label for automerge.yml --- .github/workflows/automerge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index e6fc131..9d58211 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -32,6 +32,6 @@ jobs: name: automerge uses: "pascalgn/automerge-action@v0.15.6" env: - MERGE_LABELS: "!automerge" + MERGE_LABELS: "auto" MERGE_METHOD: "rebase" GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" From a376e9ee2a7085edc9b9fa4df8a7bbeae315f414 Mon Sep 17 00:00:00 2001 From: "Agusti B.R" Date: Mon, 23 Oct 2023 14:43:13 +0200 Subject: [PATCH 14/17] Update CODEOWNERS --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index a206145..c7ca1d2 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -5,7 +5,7 @@ # the repo. Unless a later match takes precedence, # @global-owner1 and @global-owner2 will be requested for # review when someone opens a pull request. -* @agustibr +#* @agustibr # Order is important; the last matching pattern takes the most # precedence. When someone opens a pull request that only From 34a733685e75afc51705e27920fae7862b0f7315 Mon Sep 17 00:00:00 2001 From: Ignasi Fosch Date: Mon, 23 Oct 2023 14:37:44 +0200 Subject: [PATCH 15/17] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d761854..471edbe 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # plus_pull_replacement -Hackdays@Devex code review +Hackdays@Devex code review test ## Plus Pull From f23cd6700121fce8ccfe1a745e7d554d35391334 Mon Sep 17 00:00:00 2001 From: Ignasi Fosch Date: Mon, 23 Oct 2023 16:37:01 +0200 Subject: [PATCH 16/17] Add UPDATE_LABELS to automerge.yml --- .github/workflows/automerge.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 9d58211..c296011 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -32,6 +32,7 @@ jobs: name: automerge uses: "pascalgn/automerge-action@v0.15.6" env: - MERGE_LABELS: "auto" + MERGE_LABELS: "" + UPDATE_LABELS: "" MERGE_METHOD: "rebase" GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" From 15ee248d443d5b09d22331e009d35eaeb39dee32 Mon Sep 17 00:00:00 2001 From: Ignasi Fosch Date: Mon, 23 Oct 2023 16:42:57 +0200 Subject: [PATCH 17/17] Make automerge.yml support blocking label --- .github/workflows/automerge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index c296011..e3d4880 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -32,7 +32,7 @@ jobs: name: automerge uses: "pascalgn/automerge-action@v0.15.6" env: - MERGE_LABELS: "" + MERGE_LABELS: "!Block" UPDATE_LABELS: "" MERGE_METHOD: "rebase" GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"