From 4b67c0fbf3c8e7a6b40f04c05c4d03816b9805c4 Mon Sep 17 00:00:00 2001 From: Paulo Gomes Date: Wed, 6 Jul 2022 16:56:11 +0100 Subject: [PATCH] build: Upgrade to Go 1.18 Signed-off-by: Paulo Gomes --- .github/workflows/build.yaml | 6 +++--- Dockerfile | 2 +- Makefile | 4 ++-- api/go.mod | 2 +- go.mod | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a647fa5c..b4fded3e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -17,7 +17,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v3 with: - go-version: 1.17.x + go-version: 1.18.x - name: Restore go cache uses: actions/cache@v3 with: @@ -41,7 +41,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v3 with: - go-version: 1.17.x + go-version: 1.18.x - name: Run tests run: make test env: @@ -64,7 +64,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v3 with: - go-version: 1.17.x + go-version: 1.18.x - name: Restore Go cache uses: actions/cache@v3 with: diff --git a/Dockerfile b/Dockerfile index 91e4f1ee..ac25e9b1 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.0 ARG LIBGIT2_IMG=ghcr.io/fluxcd/golang-with-libgit2 diff --git a/Makefile b/Makefile index d10a93f8..ae5a8ca8 100644 --- a/Makefile +++ b/Makefile @@ -175,8 +175,8 @@ api-docs: gen-crd-api-reference-docs ## Generate API reference documentation $(GEN_CRD_API_REFERENCE_DOCS) -api-dir=./api/v1beta1 -config=./hack/api-docs/config.json -template-dir=./hack/api-docs/template -out-file=./docs/api/image-automation.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 ee20d8a3..2363b198 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,6 +1,6 @@ module github.com/fluxcd/image-automation-controller/api -go 1.17 +go 1.18 require ( github.com/fluxcd/pkg/apis/meta v0.14.2 diff --git a/go.mod b/go.mod index 8ca17198..5e8c3e35 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/fluxcd/image-automation-controller -go 1.17 +go 1.18 replace github.com/fluxcd/image-automation-controller/api => ./api