Skip to content

[release-1.20] use Masterminds/semver instead of x/mod - #2178

Merged
cdesiniotis merged 1 commit into
release-1.20from
backport-2015-to-release-1.20
Oct 26, 2026
Merged

cdesiniotis merged 1 commit into
release-1.20from
backport-2015-to-release-1.20

Conversation

@github-actions

Copy link
Copy Markdown

🤖 Automated backport of #2015 to release-1.20

⚠️ This PR has merge conflicts that need manual resolution.

Original PR: #2015
Original Author: @tariq1890

Cherry-picked commits (1):

  • 36e8473 use Masterminds/semver instead of x/mod

Next Steps:

  1. Review the conflicts in the "Files changed" tab
  2. Check out this branch locally: git fetch origin backport-2015-to-release-1.20 && git checkout backport-2015-to-release-1.20
  3. Resolve conflicts manually
  4. Push the resolution: git push --force-with-lease origin backport-2015-to-release-1.20

Instructions for resolving conflicts
git fetch origin backport-2015-to-release-1.20
git checkout backport-2015-to-release-1.20
# Resolve conflicts in your editor
git add .
git commit
git push --force-with-lease origin backport-2015-to-release-1.20

@copy-pr-bot

copy-pr-bot Bot commented Oct 26, 2026

Copy link
Copy Markdown

This pull request requires additional validation before any workflows can run on NVIDIA's runners.

Pull request vetters can view their responsibilities here.

Contributors can view more details about this message here.

Signed-off-by: Tariq Ibrahim <tibrahim@nvidia.com>
(cherry picked from commit 36e8473)
Co-authored-by: Christopher Desiniotis <cdesiniotis@nvidia.com>
@cdesiniotis
cdesiniotis force-pushed the backport-2015-to-release-1.20 branch from 25c975e to ceb9d1c Compare October 26, 2026 21:49
@cdesiniotis
cdesiniotis requested a review from tariq1890 October 26, 2026 21:50
@cdesiniotis
cdesiniotis marked this pull request as ready for review October 26, 2026 21:50
@cdesiniotis

Copy link
Copy Markdown
Contributor

/ok to test ceb9d1c

@cdesiniotis

Copy link
Copy Markdown
Contributor

Backporting this change so that the NRI version bump in #2177 can also remove x/mod from our go.mod file entirely.

@tariq1890

Copy link
Copy Markdown
Contributor

Thanks @cdesiniotis !

@coveralls

coveralls commented Oct 26, 2026 •

Copy link
Copy Markdown

Coverage Report for CI Build 40407721991

Coverage decreased (-0.03%) to 44.138%

Details

  • Coverage decreased (-0.03%) from the base build.
  • Patch coverage: 11 uncovered changes across 2 files (12 of 23 lines covered, 52.17%).
  • No coverage regressions found.

Uncovered Changes

File Changed Covered %
internal/requirements/constraints/property.go 12 3 25.0%
cmd/nvidia-container-runtime-hook/container_config.go 7 5 71.43%
Total (3 files) 23 12 52.17%

Coverage Regressions

No coverage regressions found.


Coverage Stats

Coverage Status
Relevant Lines: 13759
Covered Lines: 6073
Line Coverage: 44.14%
Coverage Strength: 0.44 hits per line

💛 - Coveralls

@cdesiniotis
cdesiniotis enabled auto-merge October 26, 2026 21:53
@cdesiniotis
cdesiniotis merged commit 523a160 into release-1.20 Oct 26, 2026
21 checks passed
@cdesiniotis
cdesiniotis deleted the backport-2015-to-release-1.20 branch October 26, 2026 22:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants