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.

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

Backport of [NET-6741] make: Add target for updating dependencies across all modules into release/1.2.x #453

Conversation

hc-github-team-consul-core
Copy link
Collaborator

Backport

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

🚨

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:
@zalimeni
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

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

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


To enable more consistent and error-proof dependency management, add a Make target that will set a dependency version across all submodules that require it.

Replicates hashicorp/consul#19785 in consul-dataplane.

This really just ensures the main go.mod stays in sync w/ int tests for now, but could help more in the future.

How I've tested this PR

Example run:

❯ make go-mod-get DEP_VERSION=github.com/hashicorp/[email protected]
--> Running go get github.com/hashicorp/[email protected] (.)
go: upgraded github.com/hashicorp/go-hclog v1.2.2 => v1.5.0
--> Running go mod tidy (.)
--> Running go get github.com/hashicorp/[email protected] (./integration-tests)
go: upgraded github.com/hashicorp/go-hclog v1.2.2 => v1.5.0
--> Running go mod tidy (./integration-tests)

❯ git status
On branch zalimeni/net-6741-add-make-target-dependency-update-modules
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
	modified:   go.mod
	modified:   go.sum
	modified:   integration-tests/go.mod
	modified:   integration-tests/go.sum

Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Feb 21, 2024

CLA assistant check
All committers have signed the CLA.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Auto approved Consul Bot automated PR

@zalimeni zalimeni force-pushed the backport/zalimeni/net-6741-add-make-target-dependency-update-modules/perfectly-innocent-molly branch from ff40b4b to c23a057 Compare February 21, 2024 17:31
@zalimeni zalimeni marked this pull request as ready for review February 21, 2024 17:31
@zalimeni zalimeni requested a review from a team as a code owner February 21, 2024 17:31
@zalimeni zalimeni enabled auto-merge (squash) February 21, 2024 17:31
@zalimeni zalimeni merged commit 74a7fc2 into release/1.2.x Feb 21, 2024
22 checks passed
@zalimeni zalimeni deleted the backport/zalimeni/net-6741-add-make-target-dependency-update-modules/perfectly-innocent-molly branch February 21, 2024 17:33
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.

4 participants