-
Notifications
You must be signed in to change notification settings - Fork 102
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Backport updated
backport
workflow [5.5] (#1470)
Backports: - #1373 - #1396 - #1414 Primarily to support the `forwardport` action. [Slack discussion](https://hazelcast.slack.com/archives/C07K9EK3V18/p1736939472006589).
- Loading branch information
1 parent
e83a30d
commit 38f435e
Showing
9 changed files
with
74 additions
and
304 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
name: Backport changes | ||
|
||
on: | ||
workflow_call: | ||
inputs: | ||
label-to-check-for: | ||
required: true | ||
type: string | ||
target-branch: | ||
required: true | ||
type: string | ||
|
||
jobs: | ||
backport: | ||
runs-on: ubuntu-latest | ||
|
||
steps: | ||
- name: Check PR for backport label | ||
id: check_pr_labels | ||
uses: shioyang/[email protected] | ||
with: | ||
github-token: ${{ secrets.GITHUB_TOKEN }} | ||
labels: ${{ inputs.label-to-check-for }} | ||
|
||
- name: See result | ||
if: runner.debug == '1' | ||
run: echo "${{ steps.check_pr_labels.outputs.result }}" | ||
|
||
- name: Checkout repository | ||
if: ${{ steps.check_pr_labels.outputs.result == 'true' }} | ||
uses: actions/checkout@v4 | ||
with: | ||
# ensure the backport target branch is checked out, too | ||
fetch-depth: 0 | ||
|
||
- if: ${{ steps.check_pr_labels.outputs.result == 'true' }} | ||
uses: hazelcast/backport/.github/actions/backport@master | ||
with: | ||
GITHUB_TOKEN: ${{ github.token }} | ||
TARGET_BRANCH: ${{ inputs.target-branch }} | ||
REF_TO_BACKPORT: ${{ github.sha }} | ||
BACKPORT_OPTIONS: --omit-labels |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,40 +1,36 @@ | ||
name: Backport changes to all maintenance branches | ||
name: Backport changes to maintenance branches | ||
on: | ||
push: | ||
branches: | ||
- main | ||
jobs: | ||
backport: | ||
strategy: | ||
matrix: | ||
branch: ['v/5.0', 'v/5.1', 'v/5.2', 'v/5.3', 'v/5.4', 'v/5.5'] | ||
get-maintenance-branches: | ||
runs-on: ubuntu-latest | ||
outputs: | ||
branches: "['5.3', '5.4', '5.5']" | ||
steps: | ||
|
||
- name: checkout | ||
uses: actions/checkout@v4 | ||
with: | ||
fetch-depth: 0 | ||
- run: exit 0 | ||
|
||
- name: Set up git config | ||
run: | | ||
git config user.name "GitHub Actions Bot" | ||
git config user.email "<>" | ||
- name: Check PR for backport label | ||
id: check_pr_labels | ||
uses: shioyang/[email protected] | ||
with: | ||
github-token: ${{ secrets.GITHUB_TOKEN }} | ||
labels: '["backport to all versions"]' | ||
|
||
- name: See result | ||
run: echo "${{ steps.check_pr_labels.outputs.result }}" | ||
backport-to-all-branch: | ||
needs: get-maintenance-branches | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
branch: ${{ fromJSON(needs.get-maintenance-branches.outputs.branches) }} | ||
uses: ./.github/workflows/backport-workflow.yml | ||
with: | ||
label-to-check-for: '["backport to all versions"]' | ||
target-branch: v/${{ matrix.branch }} | ||
secrets: inherit | ||
|
||
- name: Checkout maintenance branch and cherry-pick | ||
if: ${{ steps.check_pr_labels.outputs.result == 'true' }} | ||
run: | | ||
git fetch | ||
git checkout ${{ matrix.branch }} | ||
git cherry-pick -x --strategy=recursive -X theirs $GITHUB_SHA | ||
git push | ||
backport-to-specified-branch: | ||
needs: get-maintenance-branches | ||
strategy: | ||
fail-fast: false | ||
matrix: | ||
branch: ${{ fromJSON(needs.get-maintenance-branches.outputs.branches) }} | ||
uses: ./.github/workflows/backport-workflow.yml | ||
with: | ||
label-to-check-for: '["backport to ${{ matrix.branch }}"]' | ||
target-branch: v/${{ matrix.branch }} | ||
secrets: inherit |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,36 +5,8 @@ on: | |
- v/* | ||
jobs: | ||
forwardport: | ||
strategy: | ||
matrix: | ||
branch: ['main'] | ||
runs-on: ubuntu-latest | ||
steps: | ||
|
||
- name: checkout | ||
uses: actions/checkout@v4 | ||
with: | ||
fetch-depth: 0 | ||
|
||
- name: Set up git config | ||
run: | | ||
git config user.name "GitHub Actions Bot" | ||
git config user.email "<>" | ||
- name: Check PR for forwardport label | ||
id: check_pr_labels | ||
uses: shioyang/[email protected] | ||
with: | ||
github-token: ${{ secrets.GITHUB_TOKEN }} | ||
labels: '["forwardport to snapshot"]' | ||
|
||
- name: See result | ||
run: echo "${{ steps.check_pr_labels.outputs.result }}" | ||
|
||
- name: Checkout branch and cherry-pick | ||
if: ${{ steps.check_pr_labels.outputs.result == 'true' }} | ||
run: | | ||
git fetch | ||
git checkout ${{ matrix.branch }} | ||
git cherry-pick -x --strategy=recursive -X theirs $GITHUB_SHA | ||
git push | ||
uses: ./.github/workflows/backport-workflow.yml | ||
with: | ||
label: '["forwardport to snapshot"]' | ||
target-branch: main | ||
secrets: inherit |