Skip to content
Merged
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
41 changes: 24 additions & 17 deletions .github/workflows/cherry-pick.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,36 @@
name: Cherry pick PR into release-1.0 branch
name: Cherry-Pick into release-1.0 branch

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

jobs:
cherry_pick_release_1_0:
cherry_pick:
if: github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'cherry-pick-release-1.0')
runs-on: ubuntu-latest
name: Cherry pick into release-1.0 branch
if: ${{ contains(github.event.pull_request.labels.*.name, 'cherry-pick-release-1.0') && github.event.pull_request.merged == true }}
steps:
- name: Checkout
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Cherry pick into release-1.0 branch
uses: carloscastrojumo/github-cherry-pick-action@v1.0.10

- name: Set up Git
run: |
git config user.name "GitHub Actions Bot"
git config user.email "actions@github.com"

- name: Cherry-pick commit
run: |
git checkout release-1.0
git cherry-pick ${{ github.event.pull_request.merge_commit_sha }}

- name: Create Pull Request
uses: peter-evans/create-pull-request@v5
with:
branch: release-1.0
labels: |
cherry-pick
reviewers: |
instructlab/ui-maintainers
title: '[cherry-pick] {old_title}'
body: 'Cherry picking #{old_pull_request_id} onto this branch'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
token: ${{ secrets.GITHUB_TOKEN }}
branch: cherry-pick-${{ github.event.pull_request.number }}
base: release-1.0
title: 'Cherry-pick: Add commit to release-1.0 ${{ github.event.pull_request.title }}'
body: 'Automatically cherry-picked commit from main branch'
Loading