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

make: consistently use $(GO) to invoke the Go tool #10181

Merged
merged 1 commit into from Feb 19, 2020

Conversation

tklauser
Copy link
Member

@tklauser tklauser commented Feb 13, 2020

Otherwise when building with e.g. GO=go1.14rc1 make, the version log
message still shows:

level=info msg="Cilium 1.7.90 7051378bf234 2020-02-11T11:05:47+01:00 go version go1.13.8 linux/amd64" subsys=daemon

while e.g. go version /usr/bin/cilium-agent correctly shows:

/usr/bin/cilium-agent: go1.14rc1

Also use $(GO) when checking for -mod=vendor support.

Signed-off-by: Tobias Klauser tklauser@distanz.ch


This change is Reviewable

Otherwise when building with e.g. GO=go1.14rc1 make, the version log
message still shows:

  level=info msg="Cilium 1.7.90 7051378bf234 2020-02-11T11:05:47+01:00 go version go1.13.8 linux/amd64" subsys=daemon

while e.g. `go version /usr/bin/cilium-agent` correctly shows:

  /usr/bin/cilium-agent: go1.14rc1

Also use $(GO) when checking for `-mod=vendor0` support.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
@tklauser tklauser added pending-review release-note/misc This PR makes changes that have no direct user impact. labels Feb 13, 2020
@tklauser tklauser requested a review from a team as a code owner February 13, 2020 15:19
@maintainer-s-little-helper maintainer-s-little-helper bot added this to In progress in 1.8.0 Feb 13, 2020
@tklauser
Copy link
Member Author

test-me-please

@coveralls
Copy link

Coverage Status

Coverage increased (+0.01%) to 44.545% when pulling a7a8ed5 on pr/tklauser/makefile-use-GO-var-for-version into c95f93b on master.

@aanm aanm added this to the 1.8 milestone Feb 18, 2020
@aanm
Copy link
Member

aanm commented Feb 19, 2020

test-me-please

@borkmann borkmann merged commit 12b2ec7 into master Feb 19, 2020
1.8.0 automation moved this from In progress to Merged Feb 19, 2020
@borkmann borkmann deleted the pr/tklauser/makefile-use-GO-var-for-version branch February 19, 2020 10:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note/misc This PR makes changes that have no direct user impact.
Projects
No open projects
1.8.0
  
Merged
Development

Successfully merging this pull request may close these issues.

None yet

5 participants