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.

Sign up for GitHub

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

Jump to bottom

Bump some stale dependencies in go.mod. #4243

Merged
merged 1 commit into from
Sep 21, 2021
Merged

Bump some stale dependencies in go.mod. #4243

merged 1 commit into from
Sep 21, 2021

Conversation

dlorenc
Copy link
Contributor

@dlorenc dlorenc commented Sep 19, 2021 •
edited
Loading

Changes

This bumps:

  • go-containerregistry (and k8schain)
  • multierr
  • x/net
  • zap

Signed-off-by: Dan Lorenc [email protected]

/kind cleanup

Submitter Checklist

As the author of this PR, please check off the items in this checklist:

  • Docs included if any changes are user facing
  • Tests included if any functionality added or changed
  • Follows the commit message standard
  • Meets the Tekton contributor standards (including
    functionality, content, code)
  • Release notes block below has been filled in or deleted (only if no user facing changes)

Release Notes

NONE

@tekton-robot tekton-robot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Sep 19, 2021
@tekton-robot tekton-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. release-note-none Denotes a PR that doesnt merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. and removed release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Sep 19, 2021
vdemeester
vdemeester approved these changes Sep 20, 2021
View reviewed changes
Copy link
Member

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

@dlorenc you need to run ./hack/update-deps.sh to apply the temporary patch

@tekton-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vdemeester

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@tekton-robot tekton-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 20, 2021
@dlorenc dlorenc force-pushed the bumpsomedeps branch 3 times, most recently from e9de75e to 8e1f3f5 Compare September 21, 2021 14:08
@vdemeester
Copy link
Member

vdemeester commented Sep 21, 2021 •
edited
Loading 

Diffing /home/prow/go/src/github.com/tektoncd/pipeline against freshly generated codegen
diff -Naupr /home/prow/go/src/github.com/tektoncd/pipeline/pkg/apis/config/zz_generated.deepcopy.go /home/prow/go/src/github.com/tektoncd/pipeline/tmpdiffroot.erLKwT/pkg/apis/config/zz_generated.deepcopy.go
--- /home/prow/go/src/github.com/tektoncd/pipeline/pkg/apis/config/zz_generated.deepcopy.go	2021-09-21 14:14:16.291338870 +0000
+++ /home/prow/go/src/github.com/tektoncd/pipeline/tmpdiffroot.erLKwT/pkg/apis/config/zz_generated.deepcopy.go	2021-09-21 14:09:34.176657681 +0000
@@ -1,3 +1,4 @@
+//go:build !ignore_autogenerated
 // +build !ignore_autogenerated

Oh.. this is new.. 🤔
@dlorenc you might have a more recent version of the generator than what we have in vendor (and usually used in CI).. but this is the first time I'm seeing this.

@imjasonh
Copy link
Member

imjasonh commented Sep 21, 2021 •
edited
Loading

Go 1.17 adds these lines, and our diff checker seems to be running Go 1.16.

edit: actually, gofmt; source https://golang.org/doc/go1.17

//go:build lines

The go command now understands //go:build lines and prefers them over // +build lines. The new syntax uses boolean expressions, just like Go, and should be less error-prone. As of this release, the new syntax is fully supported, and all Go files should be updated to have both forms with the same meaning. To aid in migration, gofmt now automatically synchronizes the two forms. For more details on the syntax and migration plan, see https://golang.org/design/draft-gobuild.

@dlorenc
Copy link
Contributor Author

dlorenc commented Sep 21, 2021

Whoops, good catch @imjasonh

@vdemeester
Copy link
Member

Go 1.17 adds these lines, and our diff checker seems to be running Go 1.16.

edit: actually, gofmt; source https://golang.org/doc/go1.17

//go:build lines

The go command now understands //go:build lines and prefers them over // +build lines. The new syntax uses boolean expressions, just like Go, and should be less error-prone. As of this release, the new syntax is fully supported, and all Go files should be updated to have both forms with the same meaning. To aid in migration, gofmt now automatically synchronizes the two forms. For more details on the syntax and migration plan, see https://golang.org/design/draft-gobuild.

Oh.. that's.. kind-of bad.. because this means running the ./hack/update-deps.sh will have different output from 1.16 (or before) and 1.17 ?

@dlorenc
Bump some stale dependencies in go.mod.
33fb1b4 
This bumps:
- go-containerregistry (and k8schain)
- multierr
- x/net
- zap

Signed-off-by: Dan Lorenc <[email protected]>
@dlorenc
Copy link
Contributor Author

dlorenc commented Sep 21, 2021

Oh.. that's.. kind-of bad.. because this means running the ./hack/update-deps.sh will have different output from 1.16 (or before) and 1.17 ?

yeah.... I think I got it by running in a go 1.16 container.

@dlorenc
Copy link
Contributor Author

dlorenc commented Sep 21, 2021

/kind cleanup

@dlorenc dlorenc removed the kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. label Sep 21, 2021
@dlorenc
Copy link
Contributor Author

dlorenc commented Sep 21, 2021

/kind cleanup

@tekton-robot tekton-robot added the kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. label Sep 21, 2021
@imjasonh
Copy link
Member

/lgtm

@tekton-robot tekton-robot added the lgtm Indicates that a PR is ready to be merged. label Sep 21, 2021
@tekton-robot tekton-robot merged commit 57c0cc7 into tektoncd:main Sep 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vdemeester vdemeester vdemeester approved these changes

@imjasonh imjasonh Awaiting requested review from imjasonh

@pritidesai pritidesai Awaiting requested review from pritidesai

Assignees

@imjasonh imjasonh

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesnt merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@dlorenc @tekton-robot @vdemeester @imjasonh