Skip to content

Conversation

@hc-github-team-nomad-core
Copy link
Contributor

Backport

This PR is auto-generated from #26731 to be assessed for backporting due to the inclusion of the label backport/1.10.x.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@tgross
This person should resolve the merge-conflict(s) by either:

  • Manually completing the cherry picks into this branch
  • Creating a new branch and manually cherry-picking all commits being backported

merge conflict error: POST https://api.github.com/repos/hashicorp/nomad/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


The go-getter update in #26713 is not passing tests upstream (apparently hashicorp/go-getter#548 is the origin of the problem but that PR did not ever run tests). The issue being fixed isn't a critical vulnerability, so in the interest of preparing us for the next release, revert the go-getter change but keep the Go toolchain update.

We'll skip go-getter 1.8.0 and pick up the next patch version once its issues are fixed.


Overview of commits

@hashicorp-cla-app
Copy link

hashicorp-cla-app bot commented Sep 9, 2025

CLA assistant check
All committers have signed the CLA.

The `go-getter` update in #26713 is not passing tests upstream (apparently hashicorp/go-getter#548 is the origin of the problem but that PR did not ever run tests). The issue being fixed isn't a critical vulnerability, so in the interest of preparing us for the next release, revert the `go-getter` change but keep the Go toolchain update.

We'll skip go-getter 1.8.0 and pick up the next patch version once its issues are fixed.
Reverts commit 8a96929.
@tgross tgross force-pushed the backport/revert-go-getter/sensibly-polite-thrush branch from 81b5656 to c805733 Compare September 9, 2025 13:31
@tgross tgross marked this pull request as ready for review September 9, 2025 13:32
@tgross tgross requested review from a team as code owners September 9, 2025 13:32
@tgross tgross merged commit 6d6d045 into release/1.10.x Sep 9, 2025
36 checks passed
@tgross tgross deleted the backport/revert-go-getter/sensibly-polite-thrush branch September 9, 2025 13:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants