Repository navigation
chore: merge upstream/main (resolve required-ci-gates.yml CARRY conflict) - #84
Merged
Merged
Conversation
Signed-off-by: Adrien Langou <alangou@nvidia.com>
* fix(ci): stop running e2e in merge queues Signed-off-by: Evan Lezar <elezar@nvidia.com> * fix(ci): build e2e artifacts only for selected tests Signed-off-by: Evan Lezar <elezar@nvidia.com> --------- Signed-off-by: Evan Lezar <elezar@nvidia.com>
…VIDIA#4236) Signed-off-by: Adrien Langou <alangou@nvidia.com>
Bumps [source-map-js](https://github.com/7rulnik/source-map-js) from 1.2.1 to 1.2.2. - [Release notes](https://github.com/7rulnik/source-map-js/releases) - [Changelog](https://github.com/7rulnik/source-map-js/blob/main/CHANGELOG.md) - [Commits](7rulnik/source-map-js@v1.2.1...v1.2.2) --- updated-dependencies: - dependency-name: source-map-js dependency-version: 1.2.2 dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Simon Scatton <sscatton@nvidia.com>
Resolve a conflict in .github/workflows/required-ci-gates.yml between the CARRY commit that posts success for the disabled Branch Checks and Helm Lint gates and upstream NVIDIA#4232, which skips the E2E gates for merge groups. Both changes are kept. Signed-off-by: Emilien Macchi <emacchi@redhat.com>
|
Important
This repository does not receive automatic reviews because it has fewer than 10 stars. ⚙️ Run configuration
Comment |
EmilienM
enabled auto-merge
October 6, 2026 17:00
andre-motta
approved these changes
Oct 6, 2026
andre-motta
left a comment
andre-motta
left a comment
Member
There was a problem hiding this comment.
LGTM. Verified locally:
- The merge parents are current main (305c8b3) and current upstream/main (8760396), and it brings in upstream NVIDIA#4127, NVIDIA#4232, NVIDIA#4236, NVIDIA#4224 and NVIDIA#4235.
- Apart from the conflicted file, the merge commit matches git merge-tree's automatic result, so there are no manual edits elsewhere.
- required-ci-gates.yml differs from upstream/main only by the CARRY 831dddf lines, and upstream's merge_group guard on the E2E gates is kept.
- skills/debug-openshell-cluster/SKILL.md merged automatically and keeps both the fork's and upstream's changes.
Lets wait for the 4 Konflux builds to go green (the Cargo.lock bump from NVIDIA#4127 feeds into them)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Unblocks the upstream-to-downstream auto-merge, which failed today on a conflict in
.github/workflows/required-ci-gates.yml.The conflict is between two compatible changes on adjacent lines:
831dddf1c CARRY: ci: stop Branch Checks and Helm Lint gates from pending foreverposts success directly for the Branch Checks and Helm Lint gates.fix(ci): stop running e2e in merge queues) wraps the E2E and GPU E2E gates inif [ "$CONTEXT_KIND" != "merge_group" ].The resolution keeps both. After the merge,
required-ci-gates.ymldiffers fromupstream/mainonly by the CARRY lines. No other files conflicted.Merge note
Please merge with "Create a merge commit" (not squash or rebase), so
upstream/mainis recorded as merged and the next auto-merge run doesn't hit the same conflict.Testing
git merge-treeconfirms this is the only conflict betweenorigin/mainandupstream/main🤖 Generated with Claude Code