Fix : ZStream Dependency Auto Merging #12483
Conversation
jyejare
added
6.11.z
There was a problem hiding this comment.
@jyejare Added one question, and why target branch for this PR is 6.14.z?
|
|
||
| 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') |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
- This GHA does not runs on master as per the event condition:
branches-ignore: - master - The GHA for doing same on master is different and has different steps so this wont conflict!
There was a problem hiding this comment.
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
There was a problem hiding this comment.
@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!
There was a problem hiding this comment.
@jyejare even after I was adding label it was failing
There was a problem hiding this comment.
@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!
There was a problem hiding this comment.
@Gauravtalreja1 @omkarkhatavkar PR open to fix missing dependencies label in zStream PRs: #12682
There was a problem hiding this comment.
@Gauravtalreja1 Since the PR #12682 is now merged , can we merge this as well ! We can wait for cherrypicks to merge though !
|
@Gauravtalreja1 Target Branch for this PR is 6.14 because this Github Action works different with zBranches than master, So it is openend in 6.14 and would be cherrypicked to rest of zBranches! |
jyejare
changed the title
jyejare
force-pushed
the
depen_merge_zstresm
branch
from
aba402e to
9a9407b
Compare
JacobCallahan
added
the
6.14.z
Fixing the AutoMerge of Dependabot AutoCherrypicked PRs are not running.
Attempt to change:
pull_request_targeteventdependencylabelGood if this is merged along with #12682 that copies dependencies label to zStream cherrypicked PRs !