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/DEVELOPMENT.md b/DEVELOPMENT.md index f9afa686..9c815933 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -97,7 +97,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 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 diff --git a/tests/fuzz/go.mod b/tests/fuzz/go.mod index ac8c73a5..56936047 100644 --- a/tests/fuzz/go.mod +++ b/tests/fuzz/go.mod @@ -2,7 +2,7 @@ // Replaced by oss_fuzz_build.sh. module github.com/fluxcd/image-automation-controller/tests/fuzz -go 1.17 +go 1.18 replace ( github.com/fluxcd/image-automation-controller/api => ../../api diff --git a/tests/fuzz/oss_fuzz_build.sh b/tests/fuzz/oss_fuzz_build.sh index 40deceb3..b04c1f96 100755 --- a/tests/fuzz/oss_fuzz_build.sh +++ b/tests/fuzz/oss_fuzz_build.sh @@ -77,7 +77,7 @@ SOURCE_VER=$(go list -m github.com/fluxcd/source-controller/api | awk '{print $2 REFLECTOR_VER=$(go list -m github.com/fluxcd/image-reflector-controller/api | awk '{print $2}') go mod download -go mod tidy -go=1.16 && go mod tidy -go=1.17 +go mod tidy -go=1.18 go get -d github.com/fluxcd/image-automation-controller go get -d github.com/AdaLogics/go-fuzz-headers