Skip to content

Commit

Permalink
Revert "[infra] Introduce automated cherry-picking workflow (#15262)"
Browse files Browse the repository at this point in the history
This reverts commit 03b17aa.
  • Loading branch information
michelengelen committed Nov 5, 2024
1 parent b834a8c commit a687ec0
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 18 deletions.
34 changes: 34 additions & 0 deletions .github/workflows/cherry-pick-master-to-v7.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Cherry pick master to v7

on:
pull_request_target:
branches:
- master
types: ['closed']

permissions: {}

jobs:
cherry_pick_to_v7:
runs-on: ubuntu-latest
name: Cherry pick into v7
permissions:
pull-requests: write
contents: write
if: ${{ contains(github.event.pull_request.labels.*.name, 'needs cherry-pick') && github.event.pull_request.merged == true }}
steps:
- name: Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0
- name: Cherry pick and create the new PR
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
uses: carloscastrojumo/github-cherry-pick-action@503773289f4a459069c832dc628826685b75b4b3 # v1.0.10
with:
branch: v7.x
body: 'Cherry-pick of #{old_pull_request_id}'
cherry-pick-branch: ${{ format('cherry-pick-{0}', github.event.number) }}
title: '{old_title} (@${{ github.event.pull_request.user.login }})'
labels: |
cherry-pick
34 changes: 34 additions & 0 deletions .github/workflows/cherry-pick-v7-to-v6.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Cherry pick v7 to v6

on:
pull_request_target:
branches:
- v7.x
types: ['closed']

permissions: {}

jobs:
cherry_pick_v7_to_v6:
runs-on: ubuntu-latest
name: Cherry pick v7 into v6
permissions:
pull-requests: write
contents: write
if: ${{ contains(github.event.pull_request.labels.*.name, 'needs cherry-pick') && github.event.pull_request.merged == true }}
steps:
- name: Checkout
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
fetch-depth: 0
- name: Cherry pick and create the new PR
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
uses: carloscastrojumo/github-cherry-pick-action@503773289f4a459069c832dc628826685b75b4b3 # v1.0.10
with:
branch: v6.x
body: 'Cherry-pick of #{old_pull_request_id}'
cherry-pick-branch: ${{ format('cherry-pick-{0}', github.event.number) }}
title: '{old_title} (@${{ github.event.pull_request.user.login }})'
labels: |
cherry-pick
18 changes: 0 additions & 18 deletions .github/workflows/create-cherry-pick-pr.yml

This file was deleted.

0 comments on commit a687ec0

Please sign in to comment.