From b47d468e8f8530105de77a2ab39730e8f16bbeb9 Mon Sep 17 00:00:00 2001 From: Philip Laine Date: Tue, 5 Jul 2022 21:43:42 +0200 Subject: [PATCH] Upgrade to go 1.18 Signed-off-by: Philip Laine --- DEVELOPMENT.md | 2 +- Dockerfile | 2 +- Makefile | 4 ++-- api/go.mod | 2 +- go.mod | 2 +- tests/fuzz/go.mod | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 29464406..18b5829c 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -45,7 +45,7 @@ If any of the above dependencies are not present on your system, the first invoc ## How to run the test suite Prerequisites: -* Go >= 1.17 +* Go >= 1.18 You can run the test suite by simply doing diff --git a/Dockerfile b/Dockerfile index 068938a2..4d30312d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ ARG BASE_VARIANT=alpine -ARG GO_VERSION=1.17 +ARG GO_VERSION=1.18 ARG XX_VERSION=1.1.2 ARG LIBGIT2_IMG=ghcr.io/fluxcd/golang-with-libgit2-only diff --git a/Makefile b/Makefile index e8734423..f783d6b2 100644 --- a/Makefile +++ b/Makefile @@ -125,8 +125,8 @@ api-docs: gen-crd-api-reference-docs ## Generate API reference documentation $(GEN_CRD_API_REFERENCE_DOCS) -api-dir=./api/v1beta2 -config=./hack/api-docs/config.json -template-dir=./hack/api-docs/template -out-file=./docs/api/source.md tidy: ## Run go mod tidy - cd api; rm -f go.sum; go mod tidy -compat=1.17 - rm -f go.sum; go mod tidy -compat=1.17 + cd api; rm -f go.sum; go mod tidy -compat=1.18 + rm -f go.sum; go mod tidy -compat=1.18 fmt: ## Run go fmt against code go fmt ./... diff --git a/api/go.mod b/api/go.mod index 4f994ef8..790a076d 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,6 +1,6 @@ module github.com/fluxcd/source-controller/api -go 1.17 +go 1.18 require ( github.com/fluxcd/pkg/apis/acl v0.0.3 diff --git a/go.mod b/go.mod index 592f4637..b430aa71 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/fluxcd/source-controller -go 1.17 +go 1.18 replace github.com/fluxcd/source-controller/api => ./api diff --git a/tests/fuzz/go.mod b/tests/fuzz/go.mod index d88f3ac5..638f6fdd 100644 --- a/tests/fuzz/go.mod +++ b/tests/fuzz/go.mod @@ -1,6 +1,6 @@ module github.com/fluxcd/source-controller/tests/fuzz -go 1.17 +go 1.18 replace github.com/fluxcd/kustomize-controller/api => ../../api