Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[6.13.z] Fix dependecies PR automerge in zStream Branche #12708

Merged
merged 1 commit into from
Sep 25, 2023
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
22 changes: 9 additions & 13 deletions .github/workflows/auto_cherry_pick.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ env:
assignee: ${{ github.event.pull_request.assignee.login }}
title: ${{ github.event.pull_request.title }}
number: ${{ github.event.number }}
is_dependabot_pr: ''

jobs:

Expand Down Expand Up @@ -45,6 +46,12 @@ jobs:
with:
fetch-depth: 0

## Set env var for dependencies label PR
- name: Set env var is_dependabot_pr to `dependencies` to set the label
if: contains(github.event.pull_request.labels.*.name, 'dependencies')
run: |
echo "is_dependabot_pr=dependencies" >> $GITHUB_ENV

## CherryPicking and AutoMerging
- name: Cherrypicking to zStream branch
id: cherrypick
Expand All @@ -56,19 +63,8 @@ jobs:
labels: |
Auto_Cherry_Picked
${{ matrix.label }}
assignees: ${{ env.assignee }}

- name: Add dependencies label, if merged pr author is dependabot[bot]
id: dependencies
if: |
contains(github.event.pull_request.labels.*.name, 'dependencies') &&
github.event.pull_request.user.login == 'dependabot[bot]'
uses: jyejare/github-cherry-pick-action@main
with:
token: ${{ secrets.CHERRYPICK_PAT }}
branch: ${{ matrix.label }}
labels: |
dependencies
No-CherryPick
${{ env.is_dependabot_pr }}
assignees: ${{ env.assignee }}

- name: Add Parent PR's PRT comment to Auto_Cherry_Picked PR's
Expand Down