Skip to content

Commit

Permalink
Delete GO_VERSION
Browse files Browse the repository at this point in the history
All remaining users of the GO_VERSION file were either converted to be
updated by renovate or to use the go.mod file (in case only major and
minor version are required) in previous commits. Delete the now unneeded
GO_VERSION file.

Signed-off-by: Tobias Klauser <tobias@cilium.io>
  • Loading branch information
tklauser authored and aanm committed Apr 18, 2023
1 parent 621dcad commit ca4f4f8
Show file tree
Hide file tree
Showing 7 changed files with 1 addition and 8 deletions.
1 change: 0 additions & 1 deletion CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,6 @@ Makefile* @cilium/build
/examples/policies/kubernetes/clustermesh/ @cilium/sig-clustermesh
/FURTHER_READINGS.rst @cilium/docs-structure
/hack/ @cilium/tophat
/GO_VERSION @cilium/sig-agent
*.Jenkinsfile @cilium/ci-structure
/hubble-relay/ @cilium/sig-hubble
/images @cilium/build
Expand Down
1 change: 0 additions & 1 deletion GO_VERSION

This file was deleted.

3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ SKIP_CUSTOMVET_CHECK ?= "false"

JOB_BASE_NAME ?= cilium_test

GO_VERSION := $(shell cat GO_VERSION)
GO_MAJOR_AND_MINOR_VERSION := $(shell sed 's/\([0-9]\+\).\([0-9]\+\)\(.[0-9]\+\)\?/\1.\2/' GO_VERSION)
GO_MAJOR_AND_MINOR_VERSION := $(shell awk '/^go/ { print $$2 }' go.mod)
GO_INSTALLED_MAJOR_AND_MINOR_VERSION := $(shell $(GO) version | sed 's/go version go\([0-9]\+\).\([0-9]\+\)\(.[0-9]\+\)\?.*/\1.\2/')

TEST_LDFLAGS=-ldflags "-X github.com/cilium/cilium/pkg/kvstore.consulDummyAddress=https://consul:8443 \
Expand Down
1 change: 0 additions & 1 deletion images/cilium-docker-plugin/.dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
!/go.sum
!/go.mod
!/VERSION
!/GO_VERSION

# directories
!/.git
Expand Down
1 change: 0 additions & 1 deletion images/clustermesh-apiserver/.dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
!/go.sum
!/go.mod
!/VERSION
!/GO_VERSION

# directories
!/.git
Expand Down
1 change: 0 additions & 1 deletion images/hubble-relay/.dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
!/go.sum
!/go.mod
!/VERSION
!/GO_VERSION

# directories
!/.git
Expand Down
1 change: 0 additions & 1 deletion images/operator/.dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
!/go.sum
!/go.mod
!/VERSION
!/GO_VERSION

# directories
!/.git
Expand Down

0 comments on commit ca4f4f8

Please sign in to comment.