Skip to content

Commit 6c4c914

Browse files
committed
Github Actions: go-test go version bump to 1.18
kustomize v4 can be installed via go install Github Actions: go-test go version bump to 1.18 kustomize v3->v4 breaking changes related to supported url types don't affect our repo
1 parent ad212e9 commit 6c4c914

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/go-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
- uses: actions/setup-go@v2
2525
with:
26-
go-version: '^1.16.6' # The Go version to download (if necessary) and use.
26+
go-version: '^1.18' # The Go version to download (if necessary) and use.
2727
- run: go version
2828
- run: make test submit-coverage
2929
podman-build:

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -229,15 +229,15 @@ build-deploy: ## Build current branch image and deploy controller to the k8s clu
229229

230230
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
231231
controller-gen: ## Download controller-gen locally if necessary.
232-
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/[email protected])
232+
$(call go-install-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/[email protected])
233233

234234
KUSTOMIZE = $(shell pwd)/bin/kustomize
235235
kustomize: ## Download kustomize locally if necessary.
236-
$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/[email protected])
236+
$(call go-install-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/[email protected])
237237

238238
ENVTEST = $(shell pwd)/bin/setup-envtest
239239
envtest: ## Download envtest-setup locally if necessary.
240-
$(call go-get-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@latest)
240+
$(call go-install-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@latest)
241241

242242
# Codecov OS String for use in download url
243243
ifeq ($(OS),Windows_NT)
@@ -264,16 +264,16 @@ submit-coverage:
264264
fi
265265
rm -f codecov tmp.*
266266

267-
# go-get-tool will 'go get' any package $2 and install it to $1.
267+
# go-install-tool will 'go install' any package $2 and install it to $1.
268268
PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
269-
define go-get-tool
269+
define go-install-tool
270270
@[ -f $(1) ] || { \
271271
set -e ;\
272272
TMP_DIR=$$(mktemp -d) ;\
273273
cd $$TMP_DIR ;\
274274
go mod init tmp ;\
275275
echo "Downloading $(2)" ;\
276-
GOBIN=$(PROJECT_DIR)/bin go get $(2) ;\
276+
GOBIN=$(PROJECT_DIR)/bin go install $(2) ;\
277277
rm -rf $$TMP_DIR ;\
278278
}
279279
endef

0 commit comments

Comments
 (0)