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.

Sign up for GitHub

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

Fix : ZStream Dependency Auto Merging #12483

Merged
merged 1 commit into from
Sep 25, 2023
Merged

Fix : ZStream Dependency Auto Merging #12483

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 6 additions & 7 deletions .github/workflows/dependency_merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
name: Dependabot Auto Merge
on: pull_request

permissions:
pull-requests: write
name: Dependabot Auto Merge - ZStream
on:
pull_request:
branches-ignore:
- master

jobs:
dependabot:
name: dependabot-auto-merge
runs-on: ubuntu-latest
if: |
github.event.pull_request.user.login == 'Satellite-QE' &&
contains( github.event.pull_request.labels.*.name, 'dependencies')
contains(github.event.pull_request.labels.*.name, 'dependencies')
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if we're going to check the dependencies label on auto-cherrypicked PRs for auto-merge, then we need an additional task to add this label if main PR also contains this, right?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. This GHA does not runs on master as per the event condition: branches-ignore: - master
  2. The GHA for doing same on master is different and has different steps so this wont conflict!

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, I get you this isn't for master, but we're talking about the dependancy automerge for zstream, but we miss dependancy and automerge-cherrypicked labels on the autocherrypicked PRs, which we've merging manually #12615

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Gauravtalreja1 Nice Catch! At least by looking at GHA automerge-cherrypicked label is not required for cherrypicked dependency PRs to merge but dependency is must.

@omkarkhatavkar I think missing that label in cherrypicked dependency PRs is the cause of aborted AutoMerges in zStream versions!

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jyejare even after I was adding label it was failing

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@omkarkhatavkar Probably because at that time we did not have this fix. Now we should fix it by:

  • Adding dependency label to Dependabot PRs which are cherrypicked by ACP GHA!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Gauravtalreja1 @omkarkhatavkar PR open to fix missing dependencies label in zStream PRs: #12682

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Gauravtalreja1 Since the PR #12682 is now merged , can we merge this as well ! We can wait for cherrypicks to merge though !


steps:
- id: find-prt-comment
Expand Down