Merge pull request #10127 from subhamkrai/update-golang-1.18

build: add support for go 1.18
This commit is contained in:
Travis Nielsen authored and GitHub committed 2022-04-21 09:46:56 -06:00
commit 529809ff53
2 files changed
+3 -3

No files matched your search

+1 -1
View File
@@ -74,7 +74,7 @@ jobs:
strategy:
fail-fast: false
matrix:
go-version: ["1.17"]
go-version: ["1.17", "1.18"]
steps:
- name: checkout
uses: actions/checkout@v2
+2 -2
View File
@@ -48,7 +48,7 @@ GO_TEST_FLAGS ?=
# ====================================================================================
# Setup go environment
GO_SUPPORTED_VERSIONS ?= 1.17
GO_SUPPORTED_VERSIONS ?= 1.17|1.18
GO_PACKAGES := $(foreach t,$(GO_SUBDIRS),$(GO_PROJECT)/$(t)/...)
GO_INTEGRATION_TEST_PACKAGES := $(foreach t,$(GO_INTEGRATION_TESTS_SUBDIRS),$(GO_PROJECT)/$(t)/integration)
@@ -210,7 +210,7 @@ $(CONTROLLER_GEN):
export CGO_ENABLED=$(CGO_ENABLED_VALUE) ;\
export GOBIN=$$CONTROLLER_GEN_TMP_DIR ;\
echo === installing controller-gen ;\
go get sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_GEN_VERSION);\
go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_GEN_VERSION);\
mv $$CONTROLLER_GEN_TMP_DIR/controller-gen $(CONTROLLER_GEN) ;\
rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
}