From e0396262460421479e5b8b80d7b142719b41ae66 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Wed, 24 Apr 2024 12:20:50 +0100 Subject: [PATCH 01/17] Update code freeze bot to check target PR branch correctly for issue_comment Signed-off-by: Andrew Leonard --- .github/workflows/code-freeze-new.yml | 54 +++++++++++++++++++++++++++ RELEASING.md | 2 +- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/code-freeze-new.yml diff --git a/.github/workflows/code-freeze-new.yml b/.github/workflows/code-freeze-new.yml new file mode 100644 index 000000000..afb65d21d --- /dev/null +++ b/.github/workflows/code-freeze-new.yml @@ -0,0 +1,54 @@ +# ******************************************************************************** +# Copyright (c) 2023 Contributors to the Eclipse Foundation +# +# See the NOTICE file(s) with this work for additional +# information regarding copyright ownership. +# +# This program and the accompanying materials are made +# available under the terms of the Apache Software License 2.0 +# which is available at https://www.apache.org/licenses/LICENSE-2.0. +# +# SPDX-License-Identifier: Apache-2.0 +# ******************************************************************************** + +name: Code Freeze New Bot + +# Controls when the workflow will run +on: + pull_request_target: + branches: + - '*' + issue_comment: + types: [created] + +permissions: + contents: write + pull-requests: write + +jobs: + codefreeze_new: + steps: + - name: Get pull request target branch + id: get-pr-target-branch + if: github.event_name == 'pull_request_target' || (github.event_name == 'issue_comment' && github.event.issue.pull_request) + run: echo "pr_target_branch=$(gh pr view $PR_NUMBER --repo $REPOSITORY --json baseRefName --jq '.baseRefName')" >> $GITHUB_OUTPUT + env: + REPOSITORY: ${{ github.repository }} + PR_NUMBER: ${{ github.event.issue.number }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Filter target branch to code freeze branches + id: filter-branch + if: github.event_name == 'pull_request_target' || (github.event_name == 'issue_comment' && github.event.issue.pull_request) + run: echo "filtered_code_freeze_branch=$(echo $PR_TARGET_BRANCH | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$')" >> $GITHUB_OUTPUT + env: + PR_TARGET_BRANCH: $${{ steps.get-pr-target-branch.outputs.pr_target_branch }} + + - name: Code Freeze New + if: (github.event_name == 'pull_request_target' || (github.event_name == 'issue_comment' && github.event.issue.pull_request)) && steps.filter-branch.outputs.filtered_code_freeze_branch == steps.get-pr-target-branch.outputs.pr_target_branch + run: echo "CODE_FREEZE $PR_TARGET_BRANCH" + env: + PR_TARGET_BRANCH: $${{ steps.get-pr-target-branch.outputs.pr_target_branch }} + + #uses: adoptium/.github/.github/workflows/code-freeze.yml@main + #secrets: inherit diff --git a/RELEASING.md b/RELEASING.md index 07cbf1757..29112911c 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -54,7 +54,7 @@ Create release branch in the format `vYYYY.MM.NN` on each of the following repos - ci-jenkins-pipelines - jenkins-helper -These branches should be named according to the following format (vYYYY.MM+NN) ,e.g v2023.03+01 , whereby the final element is an incremental counter appended to the year and month of the release. +These branches should be named according to the following format (vYYYY.MM.NN) ,e.g v2023.03.01 , whereby the final element is an incremental counter appended to the year and month of the release. If anything needs to be merged into the new branch, it should typically be merged into master, then a `git cherry-pick` operation should be done to create a new PR against the release branch. This can typically be merged without further approval. From 3a772945c3f03ebf52ad665d9a7ac24358e49da0 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Wed, 24 Apr 2024 12:26:16 +0100 Subject: [PATCH 02/17] Update code freeze bot to check target PR branch correctly for issue_comment Signed-off-by: Andrew Leonard --- .github/workflows/code-freeze-new.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/code-freeze-new.yml b/.github/workflows/code-freeze-new.yml index afb65d21d..f04c51359 100644 --- a/.github/workflows/code-freeze-new.yml +++ b/.github/workflows/code-freeze-new.yml @@ -46,9 +46,10 @@ jobs: - name: Code Freeze New if: (github.event_name == 'pull_request_target' || (github.event_name == 'issue_comment' && github.event.issue.pull_request)) && steps.filter-branch.outputs.filtered_code_freeze_branch == steps.get-pr-target-branch.outputs.pr_target_branch - run: echo "CODE_FREEZE $PR_TARGET_BRANCH" - env: - PR_TARGET_BRANCH: $${{ steps.get-pr-target-branch.outputs.pr_target_branch }} + uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0 + with: + issue-number: ${{ github.event.issue.number }} + body: echo "CODE_FREEZE ${{ github.event.issue.number }}" #uses: adoptium/.github/.github/workflows/code-freeze.yml@main #secrets: inherit From 95d681cc51a4f7e2354efb623b374f1a4bd4cee1 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Thu, 25 Apr 2024 09:49:17 +0100 Subject: [PATCH 03/17] Update code freeze bot to check target PR branch correctly for issue_comment Signed-off-by: Andrew Leonard --- .github/workflows/code-freeze-new.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/code-freeze-new.yml b/.github/workflows/code-freeze-new.yml index f04c51359..fdf076f0e 100644 --- a/.github/workflows/code-freeze-new.yml +++ b/.github/workflows/code-freeze-new.yml @@ -27,6 +27,7 @@ permissions: jobs: codefreeze_new: + runs-on: ubuntu-latest steps: - name: Get pull request target branch id: get-pr-target-branch @@ -40,6 +41,7 @@ jobs: - name: Filter target branch to code freeze branches id: filter-branch if: github.event_name == 'pull_request_target' || (github.event_name == 'issue_comment' && github.event.issue.pull_request) + # Following grep "regex" needs to exactly match the required target branches to "freeze" run: echo "filtered_code_freeze_branch=$(echo $PR_TARGET_BRANCH | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$')" >> $GITHUB_OUTPUT env: PR_TARGET_BRANCH: $${{ steps.get-pr-target-branch.outputs.pr_target_branch }} From 347e78417738f27691b931c781a8a4bebe4bf293 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Thu, 25 Apr 2024 10:31:13 +0100 Subject: [PATCH 04/17] Update code freeze bot to check target PR branch correctly for issue_comment Signed-off-by: Andrew Leonard --- .github/workflows/code-freeze-new.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/code-freeze-new.yml b/.github/workflows/code-freeze-new.yml index fdf076f0e..ca4fa65c1 100644 --- a/.github/workflows/code-freeze-new.yml +++ b/.github/workflows/code-freeze-new.yml @@ -32,7 +32,7 @@ jobs: - name: Get pull request target branch id: get-pr-target-branch if: github.event_name == 'pull_request_target' || (github.event_name == 'issue_comment' && github.event.issue.pull_request) - run: echo "pr_target_branch=$(gh pr view $PR_NUMBER --repo $REPOSITORY --json baseRefName --jq '.baseRefName')" >> $GITHUB_OUTPUT + run: echo "pr_target_branch=$("gh pr view $PR_NUMBER --repo $REPOSITORY --json baseRefName --jq '.baseRefName'")" >> $GITHUB_OUTPUT env: REPOSITORY: ${{ github.repository }} PR_NUMBER: ${{ github.event.issue.number }} @@ -42,7 +42,7 @@ jobs: id: filter-branch if: github.event_name == 'pull_request_target' || (github.event_name == 'issue_comment' && github.event.issue.pull_request) # Following grep "regex" needs to exactly match the required target branches to "freeze" - run: echo "filtered_code_freeze_branch=$(echo $PR_TARGET_BRANCH | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$')" >> $GITHUB_OUTPUT + run: echo "filtered_code_freeze_branch=$("echo $PR_TARGET_BRANCH | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$'")" >> $GITHUB_OUTPUT env: PR_TARGET_BRANCH: $${{ steps.get-pr-target-branch.outputs.pr_target_branch }} From 85156ac817c6d3b30816b0260870587cd28ecf8d Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Thu, 25 Apr 2024 10:36:11 +0100 Subject: [PATCH 05/17] Update code freeze bot to check target PR branch correctly for issue_comment Signed-off-by: Andrew Leonard --- .github/workflows/code-freeze-new.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/code-freeze-new.yml b/.github/workflows/code-freeze-new.yml index ca4fa65c1..7330e7669 100644 --- a/.github/workflows/code-freeze-new.yml +++ b/.github/workflows/code-freeze-new.yml @@ -32,7 +32,9 @@ jobs: - name: Get pull request target branch id: get-pr-target-branch if: github.event_name == 'pull_request_target' || (github.event_name == 'issue_comment' && github.event.issue.pull_request) - run: echo "pr_target_branch=$("gh pr view $PR_NUMBER --repo $REPOSITORY --json baseRefName --jq '.baseRefName'")" >> $GITHUB_OUTPUT + run: | + TARGET_BRANCH=$(gh pr view $PR_NUMBER --repo $REPOSITORY --json baseRefName --jq '.baseRefName') + echo "pr_target_branch=$TARGET_BRANCH" >> $GITHUB_OUTPUT env: REPOSITORY: ${{ github.repository }} PR_NUMBER: ${{ github.event.issue.number }} @@ -42,7 +44,9 @@ jobs: id: filter-branch if: github.event_name == 'pull_request_target' || (github.event_name == 'issue_comment' && github.event.issue.pull_request) # Following grep "regex" needs to exactly match the required target branches to "freeze" - run: echo "filtered_code_freeze_branch=$("echo $PR_TARGET_BRANCH | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$'")" >> $GITHUB_OUTPUT + run: | + FILTERED_BRANCH=$(echo $PR_TARGET_BRANCH | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$') + echo "filtered_code_freeze_branch=$FILTERED_BRANCH" >> $GITHUB_OUTPUT env: PR_TARGET_BRANCH: $${{ steps.get-pr-target-branch.outputs.pr_target_branch }} From 28fdec50fc61547f2ce4d418b75fba278f7588f4 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Thu, 25 Apr 2024 10:39:01 +0100 Subject: [PATCH 06/17] Update code freeze bot to check target PR branch correctly for issue_comment Signed-off-by: Andrew Leonard --- .github/workflows/code-freeze-new.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/code-freeze-new.yml b/.github/workflows/code-freeze-new.yml index 7330e7669..d24369e36 100644 --- a/.github/workflows/code-freeze-new.yml +++ b/.github/workflows/code-freeze-new.yml @@ -33,7 +33,7 @@ jobs: id: get-pr-target-branch if: github.event_name == 'pull_request_target' || (github.event_name == 'issue_comment' && github.event.issue.pull_request) run: | - TARGET_BRANCH=$(gh pr view $PR_NUMBER --repo $REPOSITORY --json baseRefName --jq '.baseRefName') + TARGET_BRANCH="$(gh pr view $PR_NUMBER --repo $REPOSITORY --json baseRefName --jq '.baseRefName')" echo "pr_target_branch=$TARGET_BRANCH" >> $GITHUB_OUTPUT env: REPOSITORY: ${{ github.repository }} @@ -45,7 +45,7 @@ jobs: if: github.event_name == 'pull_request_target' || (github.event_name == 'issue_comment' && github.event.issue.pull_request) # Following grep "regex" needs to exactly match the required target branches to "freeze" run: | - FILTERED_BRANCH=$(echo $PR_TARGET_BRANCH | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$') + FILTERED_BRANCH="$(echo $PR_TARGET_BRANCH | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$')" echo "filtered_code_freeze_branch=$FILTERED_BRANCH" >> $GITHUB_OUTPUT env: PR_TARGET_BRANCH: $${{ steps.get-pr-target-branch.outputs.pr_target_branch }} From eb55a9652436f2fe6dd74f4f79267ec7f633d15a Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Thu, 25 Apr 2024 10:45:28 +0100 Subject: [PATCH 07/17] Update code freeze bot to check target PR branch correctly for issue_comment Signed-off-by: Andrew Leonard --- .github/workflows/code-freeze-new.yml | 54 +++++++++++++-------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/workflows/code-freeze-new.yml b/.github/workflows/code-freeze-new.yml index d24369e36..6036e71be 100644 --- a/.github/workflows/code-freeze-new.yml +++ b/.github/workflows/code-freeze-new.yml @@ -29,33 +29,33 @@ jobs: codefreeze_new: runs-on: ubuntu-latest steps: - - name: Get pull request target branch - id: get-pr-target-branch - if: github.event_name == 'pull_request_target' || (github.event_name == 'issue_comment' && github.event.issue.pull_request) - run: | - TARGET_BRANCH="$(gh pr view $PR_NUMBER --repo $REPOSITORY --json baseRefName --jq '.baseRefName')" - echo "pr_target_branch=$TARGET_BRANCH" >> $GITHUB_OUTPUT - env: - REPOSITORY: ${{ github.repository }} - PR_NUMBER: ${{ github.event.issue.number }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Get pull request target branch + id: get-pr-target-branch + if: github.event_name == 'pull_request_target' || (github.event_name == 'issue_comment' && github.event.issue.pull_request) + run: | + TARGET_BRANCH="$(gh pr view $PR_NUMBER --repo $REPOSITORY --json baseRefName --jq '.baseRefName')" + echo "pr_target_branch=$TARGET_BRANCH" >> $GITHUB_OUTPUT + env: + REPOSITORY: ${{ github.repository }} + PR_NUMBER: ${{ github.event.issue.number }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Filter target branch to code freeze branches - id: filter-branch - if: github.event_name == 'pull_request_target' || (github.event_name == 'issue_comment' && github.event.issue.pull_request) - # Following grep "regex" needs to exactly match the required target branches to "freeze" - run: | - FILTERED_BRANCH="$(echo $PR_TARGET_BRANCH | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$')" - echo "filtered_code_freeze_branch=$FILTERED_BRANCH" >> $GITHUB_OUTPUT - env: - PR_TARGET_BRANCH: $${{ steps.get-pr-target-branch.outputs.pr_target_branch }} + - name: Filter target branch to code freeze branches + id: filter-branch + if: github.event_name == 'pull_request_target' || (github.event_name == 'issue_comment' && github.event.issue.pull_request) + # Following grep "regex" needs to exactly match the required target branches to "freeze" + run: | + FILTERED_BRANCH="$(echo $PR_TARGET_BRANCH | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$')" + echo "filtered_code_freeze_branch=$FILTERED_BRANCH" >> $GITHUB_OUTPUT + env: + PR_TARGET_BRANCH: $${{ steps.get-pr-target-branch.outputs.pr_target_branch }} - - name: Code Freeze New - if: (github.event_name == 'pull_request_target' || (github.event_name == 'issue_comment' && github.event.issue.pull_request)) && steps.filter-branch.outputs.filtered_code_freeze_branch == steps.get-pr-target-branch.outputs.pr_target_branch - uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0 - with: - issue-number: ${{ github.event.issue.number }} - body: echo "CODE_FREEZE ${{ github.event.issue.number }}" + - name: Code Freeze New + if: (github.event_name == 'pull_request_target' || (github.event_name == 'issue_comment' && github.event.issue.pull_request)) && steps.filter-branch.outputs.filtered_code_freeze_branch == steps.get-pr-target-branch.outputs.pr_target_branch + uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0 + with: + issue-number: ${{ github.event.issue.number }} + body: echo "CODE_FREEZE ${{ github.event.issue.number }}" - #uses: adoptium/.github/.github/workflows/code-freeze.yml@main - #secrets: inherit + #uses: adoptium/.github/.github/workflows/code-freeze.yml@main + #secrets: inherit From 4c79f802f9b688b1422f595d80fd669763769fe6 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Thu, 25 Apr 2024 10:50:46 +0100 Subject: [PATCH 08/17] Update code freeze bot to check target PR branch correctly for issue_comment Signed-off-by: Andrew Leonard --- .github/workflows/code-freeze-new.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/code-freeze-new.yml b/.github/workflows/code-freeze-new.yml index 6036e71be..85d162ba6 100644 --- a/.github/workflows/code-freeze-new.yml +++ b/.github/workflows/code-freeze-new.yml @@ -30,8 +30,8 @@ jobs: runs-on: ubuntu-latest steps: - name: Get pull request target branch - id: get-pr-target-branch if: github.event_name == 'pull_request_target' || (github.event_name == 'issue_comment' && github.event.issue.pull_request) + id: get-pr-target-branch run: | TARGET_BRANCH="$(gh pr view $PR_NUMBER --repo $REPOSITORY --json baseRefName --jq '.baseRefName')" echo "pr_target_branch=$TARGET_BRANCH" >> $GITHUB_OUTPUT @@ -41,8 +41,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Filter target branch to code freeze branches - id: filter-branch if: github.event_name == 'pull_request_target' || (github.event_name == 'issue_comment' && github.event.issue.pull_request) + id: filter-branch # Following grep "regex" needs to exactly match the required target branches to "freeze" run: | FILTERED_BRANCH="$(echo $PR_TARGET_BRANCH | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$')" From 3208c26153bc344c990e207497cd386a8e8f6999 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Thu, 25 Apr 2024 11:00:11 +0100 Subject: [PATCH 09/17] Update code freeze bot to check target PR branch correctly for issue_comment Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 1 + .github/workflows/code-freeze-new.yml | 52 +++++++++++++-------------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b8c9fc8e7..aef44f1cf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,6 +12,7 @@ # ******************************************************************************** --- + name: Build on: diff --git a/.github/workflows/code-freeze-new.yml b/.github/workflows/code-freeze-new.yml index 85d162ba6..4834804c1 100644 --- a/.github/workflows/code-freeze-new.yml +++ b/.github/workflows/code-freeze-new.yml @@ -29,33 +29,31 @@ jobs: codefreeze_new: runs-on: ubuntu-latest steps: - - name: Get pull request target branch - if: github.event_name == 'pull_request_target' || (github.event_name == 'issue_comment' && github.event.issue.pull_request) - id: get-pr-target-branch - run: | - TARGET_BRANCH="$(gh pr view $PR_NUMBER --repo $REPOSITORY --json baseRefName --jq '.baseRefName')" - echo "pr_target_branch=$TARGET_BRANCH" >> $GITHUB_OUTPUT - env: - REPOSITORY: ${{ github.repository }} - PR_NUMBER: ${{ github.event.issue.number }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Get pull request target branch + if: github.event_name == 'pull_request_target' || (github.event_name == 'issue_comment' && github.event.issue.pull_request) + id: get-pr-target-branch + run: | + TARGET_BRANCH="$(gh pr view $PR_NUMBER --repo $REPOSITORY --json baseRefName --jq '.baseRefName')" + echo "pr_target_branch=$TARGET_BRANCH" >> $GITHUB_OUTPUT + env: + REPOSITORY: ${{ github.repository }} + PR_NUMBER: ${{ github.event.issue.number }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Filter target branch to code freeze branches - if: github.event_name == 'pull_request_target' || (github.event_name == 'issue_comment' && github.event.issue.pull_request) - id: filter-branch - # Following grep "regex" needs to exactly match the required target branches to "freeze" - run: | - FILTERED_BRANCH="$(echo $PR_TARGET_BRANCH | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$')" - echo "filtered_code_freeze_branch=$FILTERED_BRANCH" >> $GITHUB_OUTPUT - env: - PR_TARGET_BRANCH: $${{ steps.get-pr-target-branch.outputs.pr_target_branch }} + - name: Filter target branch to code freeze branches + if: github.event_name == 'pull_request_target' || (github.event_name == 'issue_comment' && github.event.issue.pull_request) + id: filter-branch + # Following grep "regex" needs to exactly match the required target branches to "freeze" + run: | + FILTERED_BRANCH="$(echo $PR_TARGET_BRANCH | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$')" + echo "filtered_code_freeze_branch=$FILTERED_BRANCH" >> $GITHUB_OUTPUT + env: + PR_TARGET_BRANCH: $${{ steps.get-pr-target-branch.outputs.pr_target_branch }} - - name: Code Freeze New - if: (github.event_name == 'pull_request_target' || (github.event_name == 'issue_comment' && github.event.issue.pull_request)) && steps.filter-branch.outputs.filtered_code_freeze_branch == steps.get-pr-target-branch.outputs.pr_target_branch - uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0 - with: - issue-number: ${{ github.event.issue.number }} - body: echo "CODE_FREEZE ${{ github.event.issue.number }}" + - name: Code Freeze New + if: (github.event_name == 'pull_request_target' || (github.event_name == 'issue_comment' && github.event.issue.pull_request)) && steps.filter-branch.outputs.filtered_code_freeze_branch == steps.get-pr-target-branch.outputs.pr_target_branch + uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0 + with: + issue-number: ${{ github.event.issue.number }} + body: echo "CODE_FREEZE ${{ github.event.issue.number }}" - #uses: adoptium/.github/.github/workflows/code-freeze.yml@main - #secrets: inherit From e1eb96eb0098f0778d9f51551acf738d2e95297e Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 26 Apr 2024 14:34:06 +0100 Subject: [PATCH 10/17] Update code freeze bot to check target PR branch correctly for issue_comment Signed-off-by: Andrew Leonard --- .github/workflows/build.yml | 1 - .github/workflows/code-freeze-new.yml | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aef44f1cf..b8c9fc8e7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,6 @@ # ******************************************************************************** --- - name: Build on: diff --git a/.github/workflows/code-freeze-new.yml b/.github/workflows/code-freeze-new.yml index 4834804c1..eb4ce4947 100644 --- a/.github/workflows/code-freeze-new.yml +++ b/.github/workflows/code-freeze-new.yml @@ -11,6 +11,7 @@ # SPDX-License-Identifier: Apache-2.0 # ******************************************************************************** +--- name: Code Freeze New Bot # Controls when the workflow will run From 95a5dd8a34f25e3f4d25ef2b0c977c9c80fd3de5 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 26 Apr 2024 15:03:56 +0100 Subject: [PATCH 11/17] Update code freeze bot to check target PR branch correctly for issue_comment Signed-off-by: Andrew Leonard --- .github/workflows/code-freeze-new.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/code-freeze-new.yml b/.github/workflows/code-freeze-new.yml index eb4ce4947..f3aefccbf 100644 --- a/.github/workflows/code-freeze-new.yml +++ b/.github/workflows/code-freeze-new.yml @@ -34,8 +34,8 @@ jobs: if: github.event_name == 'pull_request_target' || (github.event_name == 'issue_comment' && github.event.issue.pull_request) id: get-pr-target-branch run: | - TARGET_BRANCH="$(gh pr view $PR_NUMBER --repo $REPOSITORY --json baseRefName --jq '.baseRefName')" - echo "pr_target_branch=$TARGET_BRANCH" >> $GITHUB_OUTPUT + TARGET_BRANCH="$(gh pr view "$PR_NUMBER" --repo "$REPOSITORY" --json baseRefName --jq '.baseRefName')" + echo "pr_target_branch=$TARGET_BRANCH" >> "$GITHUB_OUTPUT" env: REPOSITORY: ${{ github.repository }} PR_NUMBER: ${{ github.event.issue.number }} From 82b4dc499f0f665bd8ca0050f99eb3c64b2c6f31 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 26 Apr 2024 15:09:40 +0100 Subject: [PATCH 12/17] Update code freeze bot to check target PR branch correctly for issue_comment Signed-off-by: Andrew Leonard --- .github/workflows/code-freeze-new.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/code-freeze-new.yml b/.github/workflows/code-freeze-new.yml index f3aefccbf..f36541ca9 100644 --- a/.github/workflows/code-freeze-new.yml +++ b/.github/workflows/code-freeze-new.yml @@ -34,7 +34,7 @@ jobs: if: github.event_name == 'pull_request_target' || (github.event_name == 'issue_comment' && github.event.issue.pull_request) id: get-pr-target-branch run: | - TARGET_BRANCH="$(gh pr view "$PR_NUMBER" --repo "$REPOSITORY" --json baseRefName --jq '.baseRefName')" + TARGET_BRANCH="$(gh pr view $PR_NUMBER --repo $REPOSITORY --json baseRefName --jq '.baseRefName')" echo "pr_target_branch=$TARGET_BRANCH" >> "$GITHUB_OUTPUT" env: REPOSITORY: ${{ github.repository }} From c713fcb633dc3bf3d6a486889e07da154a262748 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 26 Apr 2024 15:13:55 +0100 Subject: [PATCH 13/17] Update code freeze bot to check target PR branch correctly for issue_comment Signed-off-by: Andrew Leonard --- .github/workflows/code-freeze-new.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/code-freeze-new.yml b/.github/workflows/code-freeze-new.yml index f36541ca9..7dd16104f 100644 --- a/.github/workflows/code-freeze-new.yml +++ b/.github/workflows/code-freeze-new.yml @@ -34,7 +34,8 @@ jobs: if: github.event_name == 'pull_request_target' || (github.event_name == 'issue_comment' && github.event.issue.pull_request) id: get-pr-target-branch run: | - TARGET_BRANCH="$(gh pr view $PR_NUMBER --repo $REPOSITORY --json baseRefName --jq '.baseRefName')" + echo "Getting target branch" + TARGET_BRANCH="$(gh pr view "$PR_NUMBER" --repo "$REPOSITORY" --json baseRefName --jq '.baseRefName')" echo "pr_target_branch=$TARGET_BRANCH" >> "$GITHUB_OUTPUT" env: REPOSITORY: ${{ github.repository }} @@ -46,8 +47,8 @@ jobs: id: filter-branch # Following grep "regex" needs to exactly match the required target branches to "freeze" run: | - FILTERED_BRANCH="$(echo $PR_TARGET_BRANCH | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$')" - echo "filtered_code_freeze_branch=$FILTERED_BRANCH" >> $GITHUB_OUTPUT + FILTERED_BRANCH="$(echo "$PR_TARGET_BRANCH" | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$')" + echo "filtered_code_freeze_branch=$FILTERED_BRANCH" >> "$GITHUB_OUTPUT" env: PR_TARGET_BRANCH: $${{ steps.get-pr-target-branch.outputs.pr_target_branch }} From b92da0343101232187813732fabf30436c79f66c Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 26 Apr 2024 15:20:08 +0100 Subject: [PATCH 14/17] Update code freeze bot to check target PR branch correctly for issue_comment Signed-off-by: Andrew Leonard --- .github/workflows/code-freeze-new.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/code-freeze-new.yml b/.github/workflows/code-freeze-new.yml index 7dd16104f..387a58370 100644 --- a/.github/workflows/code-freeze-new.yml +++ b/.github/workflows/code-freeze-new.yml @@ -30,6 +30,12 @@ jobs: codefreeze_new: runs-on: ubuntu-latest steps: + - name: Code Freeze Run + uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0 + with: + issue-number: ${{ github.event.issue.number }} + body: echo "CODE_FREEZE ${{ github.event.issue.number }}" + - name: Get pull request target branch if: github.event_name == 'pull_request_target' || (github.event_name == 'issue_comment' && github.event.issue.pull_request) id: get-pr-target-branch From e3b6e70167ab2d2592ddd17e59c73b4e21eef531 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 26 Apr 2024 15:34:14 +0100 Subject: [PATCH 15/17] Update code freeze bot to check target PR branch correctly for issue_comment Signed-off-by: Andrew Leonard --- .github/workflows/code-freeze-new.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/code-freeze-new.yml b/.github/workflows/code-freeze-new.yml index 387a58370..f127ecade 100644 --- a/.github/workflows/code-freeze-new.yml +++ b/.github/workflows/code-freeze-new.yml @@ -16,6 +16,7 @@ name: Code Freeze New Bot # Controls when the workflow will run on: + push: pull_request_target: branches: - '*' From 6399253bb9c9c5c5b0a7c86f57e75335936d8644 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 26 Apr 2024 15:35:08 +0100 Subject: [PATCH 16/17] Update code freeze bot to check target PR branch correctly for issue_comment Signed-off-by: Andrew Leonard --- .github/workflows/code-freeze-new.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/code-freeze-new.yml b/.github/workflows/code-freeze-new.yml index f127ecade..387a58370 100644 --- a/.github/workflows/code-freeze-new.yml +++ b/.github/workflows/code-freeze-new.yml @@ -16,7 +16,6 @@ name: Code Freeze New Bot # Controls when the workflow will run on: - push: pull_request_target: branches: - '*' From ade2a4ed753f2d8b714a5b45c7e63b014f5e8be4 Mon Sep 17 00:00:00 2001 From: Andrew Leonard Date: Fri, 26 Apr 2024 15:44:31 +0100 Subject: [PATCH 17/17] Update code freeze bot to check target PR branch correctly for issue_comment Signed-off-by: Andrew Leonard --- .github/workflows/code-freeze-new.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/code-freeze-new.yml b/.github/workflows/code-freeze-new.yml index 387a58370..0a4573cbf 100644 --- a/.github/workflows/code-freeze-new.yml +++ b/.github/workflows/code-freeze-new.yml @@ -12,7 +12,7 @@ # ******************************************************************************** --- -name: Code Freeze New Bot +name: Code Freeze New freeze Bot # Controls when the workflow will run on: