Skip to content

Commit

Permalink
chore: update cherry pick workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
jtoar committed Sep 16, 2022
1 parent 4484d92 commit 9360496
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 13 deletions.
21 changes: 21 additions & 0 deletions .github/workflows/approve-and-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: 🤖 Approve and merge release PR

on:
pull_request_target:
branches: [release]
types: [labeled]

jobs:
approve-and-merge-release-PR:
name: 🤖 Approve and merge release PR
runs-on: ubuntu-latest
if: contains(github.event.pull_request.labels.*.name, 'cherry-pick')
steps:
- name: Approve
uses: hmarr/auto-approve-action@v2

- name: Enable auto-merge
uses: reitermarkus/automerge@main
with:
token: ${{ secrets.JTOAR_TOKEN }}
merge-method: squash
22 changes: 9 additions & 13 deletions .github/workflows/release-pr.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
name: Release PR
name: 🍒 Cherry pick commit into PR against release

on:
pull_request:
branches:
- main
types: ["closed"]

branches: [main]
types: [closed]

jobs:
release_pr:
cherry-pick-commit-into-pr-against-release:
runs-on: ubuntu-latest
name: release_pr
name: 🍒 Cherry pick commit into PR against release

if: ${{ !contains(github.event.pull_request.labels.*.name, 'release:feature-breaking') }}
steps:
Expand All @@ -19,11 +17,9 @@ jobs:
with:
fetch-depth: 0

- name: Cherry pick into next
- name: Cherry pick into release
uses: carloscastrojumo/[email protected]
with:
branch: next
labels: |
cherry-pick
reviewers: |
jtoar
token: ${{ secrets.JTOAR_TOKEN }}
branch: release
labels: cherry-pick

0 comments on commit 9360496

Please sign in to comment.