From 7995b67d74a63bd540e1b3693b923da8e210ff18 Mon Sep 17 00:00:00 2001 From: Hinai90 <142529789+Hinai90@users.noreply.github.com> Date: Thu, 7 Sep 2023 13:02:20 +0200 Subject: [PATCH 1/7] testing pull request --- test_pr_mohammed.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test_pr_mohammed.txt diff --git a/test_pr_mohammed.txt b/test_pr_mohammed.txt new file mode 100644 index 00000000..5e1c309d --- /dev/null +++ b/test_pr_mohammed.txt @@ -0,0 +1 @@ +Hello World \ No newline at end of file From a41760fc2de0f53bb9ef7d442d064788ce140a2f Mon Sep 17 00:00:00 2001 From: Javier Cortejoso Date: Mon, 9 Oct 2023 18:27:17 +0200 Subject: [PATCH 2/7] quick change --- .github/workflows/automerge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 061da402..02f5dd04 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -10,6 +10,7 @@ on: - ready_for_review - reopened - unlocked + - closed pull_request_review: types: - submitted From 3cce93eaa07fd9d5e13ed98a235935f1cdba7983 Mon Sep 17 00:00:00 2001 From: Javier Cortejoso Date: Mon, 9 Oct 2023 16:31:07 +0000 Subject: [PATCH 3/7] Undo change --- .github/workflows/automerge.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 02f5dd04..061da402 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -10,7 +10,6 @@ on: - ready_for_review - reopened - unlocked - - closed pull_request_review: types: - submitted From fef2dcc8ac4325f6f272dee8b4236c83c0ee1451 Mon Sep 17 00:00:00 2001 From: Javier Cortejoso Date: Sat, 14 Oct 2023 08:33:48 +0000 Subject: [PATCH 4/7] Update actions --- .github/labeler.yml | 2 ++ .github/workflows/automerge.yml | 5 ++++- .github/workflows/label.yml | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 6289933e..4569b1f0 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,2 +1,4 @@ automerge: - '**/**' +- any: ['**/**'] + all: ['!.github/**', '!README.md', '!LICENSE'] diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 061da402..3f193413 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -20,9 +20,12 @@ on: jobs: automerge: runs-on: ubuntu-latest + permissions: + contents: write + pull-requests: write steps: - name: automerge - uses: "pascalgn/automerge-action@v0.15.5" + uses: pascalgn/automerge-action@v0.15.6 env: GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" MERGE_LABELS: "automerge" diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml index 0e75888d..3a59e4f1 100644 --- a/.github/workflows/label.yml +++ b/.github/workflows/label.yml @@ -5,6 +5,9 @@ on: jobs: label: runs-on: ubuntu-latest + permissions: + contents: read + pull-requests: write steps: - uses: actions/labeler@v4 with: From e56b19730ec9a3447adcdd8629020c0a539b880e Mon Sep 17 00:00:00 2001 From: alesp1307 <146361867+alesp1307@users.noreply.github.com> Date: Sat, 14 Oct 2023 13:56:35 -0600 Subject: [PATCH 5/7] Test Pull request alesp1307 --- hello.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 hello.txt diff --git a/hello.txt b/hello.txt new file mode 100644 index 00000000..cca6bfe6 --- /dev/null +++ b/hello.txt @@ -0,0 +1,2 @@ +Test Pull + From d6eed0a28660ca739cbc487a4fd5d0bef3cc53a8 Mon Sep 17 00:00:00 2001 From: fantidev <35653314+fantidev@users.noreply.github.com> Date: Sun, 15 Oct 2023 17:38:58 +0200 Subject: [PATCH 6/7] test pull request module 2 --- Users_files/test_pr_fabriceA.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 Users_files/test_pr_fabriceA.txt diff --git a/Users_files/test_pr_fabriceA.txt b/Users_files/test_pr_fabriceA.txt new file mode 100644 index 00000000..6ef6bb25 --- /dev/null +++ b/Users_files/test_pr_fabriceA.txt @@ -0,0 +1 @@ +Fabrice A. \ No newline at end of file From 41980733080c8918631e93e0069e322b350c3d74 Mon Sep 17 00:00:00 2001 From: BertaFraga <147860836+BertaFraga@users.noreply.github.com> Date: Sun, 15 Oct 2023 20:43:47 -0400 Subject: [PATCH 7/7] Create test_pr_BertaFraga Pull test --- Users_files/test_pr_BertaFraga | 1 + 1 file changed, 1 insertion(+) create mode 100644 Users_files/test_pr_BertaFraga diff --git a/Users_files/test_pr_BertaFraga b/Users_files/test_pr_BertaFraga new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/Users_files/test_pr_BertaFraga @@ -0,0 +1 @@ +