From b063d933aa182920f5e9f0c5d2c8b59224ed3ba9 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Wed, 3 Apr 2024 16:28:22 -0400 Subject: [PATCH 1/5] Add more Signed-off-by: Peter Zhu --- .github/workflows/backport.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 6559b3b15b..5ad079abbd 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -42,7 +42,7 @@ jobs: - name: Label new backport PR with backport-automerge label run: | - PR_BRANCH=backport/backport-<%= number %>-to-<%= base %> + PR_BRANCH=backport/backport-${{ github.event.pull_request.number }}-to-${{ github.event.pull_request.base.ref }} PR_NUMBER=`gh pr list -R opensearch-project/documentation-website --json "number,headRefName" --state open | jq -r ".[] | select(.headRefName == \"$PR_BRANCH\") | .number"` echo "Update Backport PR #$PR_NUMBER on branch $PR_BRANCH with backport-automerge label" gh issue edit -R opensearch-project/documentation-website $PR_NUMBER --add-label backport-automerge From 6c6c1a3d7b5ed0a7008db054ea86f59f6cafe45a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 4 Apr 2024 19:22:18 +0000 Subject: [PATCH 2/5] Test more (#6884) Signed-off-by: Peter Zhu (cherry picked from commit 3a8450dd9ecfe06ba83ccdb63807e62538b103dc) Signed-off-by: github-actions[bot] --- .github/workflows/123 | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/workflows/123 diff --git a/.github/workflows/123 b/.github/workflows/123 new file mode 100644 index 0000000000..190a18037c --- /dev/null +++ b/.github/workflows/123 @@ -0,0 +1 @@ +123 From caa0035677fccf23fc003ede19e5f6af53faea3c Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Thu, 4 Apr 2024 16:03:27 -0400 Subject: [PATCH 3/5] Test more Signed-off-by: Peter Zhu --- .github/workflows/automerge-backport.yml | 39 ++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .github/workflows/automerge-backport.yml diff --git a/.github/workflows/automerge-backport.yml b/.github/workflows/automerge-backport.yml new file mode 100644 index 0000000000..332a18d9fd --- /dev/null +++ b/.github/workflows/automerge-backport.yml @@ -0,0 +1,39 @@ +name: automerge backport +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-backport: + if: github.repository == 'opensearch-project/documentation-website' + runs-on: ubuntu-latest + steps: + - id: automerge + name: automerge + uses: "pascalgn/automerge-action@v0.16.2" + env: + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + MERGE_LABELS: "backport-automerge,!On hold" + MERGE_FILTER_AUTHOR: "opensearch-trigger-bot[bot]" + MERGE_REQUIRED_APPROVALS: "1" + MERGE_RETRIES: "20" + MERGE_RETRY_SLEEP: "10000" + MERGE_ERROR_FAIL: "true" + MERGE_FORKS: "false" + MERGE_METHOD: "squash" + MERGE_DELETE_BRANCH: "true" + MERGE_READY_STATE: "clean" From 512776bae4ce7e4a558085b11741a4fecadbad77 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Thu, 4 Apr 2024 16:53:23 -0400 Subject: [PATCH 4/5] Test more Signed-off-by: Peter Zhu --- .github/workflows/automerge-backport.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/automerge-backport.yml b/.github/workflows/automerge-backport.yml index 332a18d9fd..b6585c66f5 100644 --- a/.github/workflows/automerge-backport.yml +++ b/.github/workflows/automerge-backport.yml @@ -22,6 +22,8 @@ jobs: if: github.repository == 'opensearch-project/documentation-website' runs-on: ubuntu-latest steps: + - name: Wait some time so that label and approval is up + run: sleep 60 - id: automerge name: automerge uses: "pascalgn/automerge-action@v0.16.2" From 6c9e928064ddcc4d29308b793e9768cf6b62f70f Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Thu, 4 Apr 2024 17:10:44 -0400 Subject: [PATCH 5/5] Test more Signed-off-by: Peter Zhu --- .github/workflows/automerge-backport.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/automerge-backport.yml b/.github/workflows/automerge-backport.yml index b6585c66f5..e310cf935c 100644 --- a/.github/workflows/automerge-backport.yml +++ b/.github/workflows/automerge-backport.yml @@ -23,7 +23,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Wait some time so that label and approval is up - run: sleep 60 + run: sleep 30 - id: automerge name: automerge uses: "pascalgn/automerge-action@v0.16.2" @@ -38,4 +38,3 @@ jobs: MERGE_FORKS: "false" MERGE_METHOD: "squash" MERGE_DELETE_BRANCH: "true" - MERGE_READY_STATE: "clean"