From 5738ac7071e2ad9cac98305a43da1eed14335bf0 Mon Sep 17 00:00:00 2001 From: Andy Sadler Date: Tue, 22 Aug 2023 06:55:37 -0500 Subject: [PATCH] add cherry pick action for v1.4.x release branch (#1481) Signed-off-by: Andy Sadler --- .github/workflows/pr-cherry-picks.yaml | 31 +++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr-cherry-picks.yaml b/.github/workflows/pr-cherry-picks.yaml index 984c81abaa..bb3e94b5c8 100644 --- a/.github/workflows/pr-cherry-picks.yaml +++ b/.github/workflows/pr-cherry-picks.yaml @@ -29,6 +29,7 @@ jobs: exclude-labels: | release/v1.2.x release/v1.3.x + release/v1.4.x labels: | cherry-pick title-prefix: "cherry-pick(release-v1.1.x): " @@ -54,6 +55,7 @@ jobs: exclude-labels: | release/v1.1.x release/v1.3.x + release/v1.4.x labels: | cherry-pick title-prefix: "cherry-pick(release-v1.2.x): " @@ -70,7 +72,7 @@ jobs: uses: webfactory/ssh-agent@v0.8.0 with: ssh-private-key: ${{ secrets.SBO_CHERRY_PICK_REPO_SSH_PRIVATE_KEY }} - - name: Cherry pick into release-v1.2.x + - name: Cherry pick into release-v1.3.x uses: pmacik/github-cherry-pick-action@main with: cherry-pick-repo: ${{ secrets.SBO_CHERRY_PICK_REPO }} @@ -79,6 +81,33 @@ jobs: exclude-labels: | release/v1.1.x release/v1.2.x + release/v1.4.x labels: | cherry-pick title-prefix: "cherry-pick(release-v1.3.x): " + cherry_pick_release_v1_4_x: + runs-on: ubuntu-latest + name: Cherry pick into release-v1.4.x branch + if: contains(github.event.pull_request.labels.*.name, 'release/v1.4.x') && github.event.pull_request.merged + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: Setup SSH for cherry-pick repo + uses: webfactory/ssh-agent@v0.8.0 + with: + ssh-private-key: ${{ secrets.SBO_CHERRY_PICK_REPO_SSH_PRIVATE_KEY }} + - name: Cherry pick into release-v1.4.x + uses: pmacik/github-cherry-pick-action@main + with: + cherry-pick-repo: ${{ secrets.SBO_CHERRY_PICK_REPO }} + token: ${{ secrets.SBO_CHERRY_PICK_BOT_TOKEN }} + branch: release-v1.4.x + exclude-labels: | + release/v1.1.x + release/v1.2.x + release/v1.3.x + labels: | + cherry-pick + title-prefix: "cherry-pick(release-v1.4.x): "