Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Externalise backport action #1373

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 0 additions & 40 deletions .github/workflows/backport-5-0.yml

This file was deleted.

40 changes: 0 additions & 40 deletions .github/workflows/backport-5-1.yml

This file was deleted.

40 changes: 0 additions & 40 deletions .github/workflows/backport-5-2.yml

This file was deleted.

40 changes: 0 additions & 40 deletions .github/workflows/backport-5-3.yml

This file was deleted.

40 changes: 0 additions & 40 deletions .github/workflows/backport-5-5.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,40 +1,43 @@
name: Backport changes to the 5.4.0 branch
name: Backport changes

nishaatr marked this conversation as resolved.
Show resolved Hide resolved
on:
push:
branches:
- main
workflow_call:
inputs:
label-to-check-for:
required: true
type: string
target-branch:
required: true
type: string

jobs:
backport:
strategy:
matrix:
branch: ['v/5.4']
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 "<>"

steps:
- name: Check PR for backport label
id: check_pr_labels
uses: shioyang/[email protected]
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
labels: '["backport to 5.4"]'
github-token: ${{ secrets.GITHUB_TOKEN }}
labels: ${{ inputs.label-to-check-for }}

- name: See result
run: echo "${{ steps.check_pr_labels.outputs.result }}"

- name: Checkout repository
if: ${{ steps.check_pr_labels.outputs.result == 'true' }}
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Checkout maintenance branch and cherry-pick
if: ${{ steps.check_pr_labels.outputs.result == 'true' }}
run: |
git config user.name "${GITHUB_ACTOR}"
git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"

git fetch
git checkout ${{ matrix.branch }}
git checkout ${{ inputs.target-branch }}
git cherry-pick -x --strategy=recursive -X theirs $GITHUB_SHA
git push
58 changes: 27 additions & 31 deletions .github/workflows/backport.yml
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:
nishaatr marked this conversation as resolved.
Show resolved Hide resolved

- 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
38 changes: 5 additions & 33 deletions .github/workflows/forwardport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]'
nishaatr marked this conversation as resolved.
Show resolved Hide resolved
target-branch: main
secrets: inherit
Loading