Skip to content

Commit

Permalink
fix up cherry-pick workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
kratsg committed Jan 10, 2023
1 parent 408205b commit 5607d15
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/cherry-pick.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
on:
pull_request:
branches:
- master
- r22/master
- main
- r21/main
types: ["closed"]

env:
Expand All @@ -11,7 +11,7 @@ env:
jobs:
cherry_pick_release_r22:
runs-on: ubuntu-latest
name: Cherry pick into r22/master
name: Cherry pick into main
if: >-
github.event.pull_request.merged
&& contains(github.event.pull_request.labels.*.name, 'sweep-r22')
Expand All @@ -23,15 +23,15 @@ jobs:
- name: Cherry pick into release-v1.0
uses: carloscastrojumo/[email protected]
with:
branch: r22/master
branch: main
labels: |
cherry-pick
reviewers: |
jbossios
cherry_pick_release_r21:
runs-on: ubuntu-latest
name: Cherry pick into master
name: Cherry pick into r21/main
if: >-
github.event.pull_request.merged
&& contains(github.event.pull_request.labels.*.name, 'sweep-r21')
Expand All @@ -43,7 +43,7 @@ jobs:
- name: Cherry pick into release-v1.0
uses: carloscastrojumo/[email protected]
with:
branch: master
branch: r21/main
labels: |
cherry-pick
reviewers: |
Expand Down

0 comments on commit 5607d15

Please sign in to comment.