Skip to content

Commit c48f0f9

Browse files
author
Paulo Gomes
authored
Merge pull request #403 from pjbgf/go-1.18
build: Upgrade to Go 1.18
2 parents 86fad83 + 0d3c97c commit c48f0f9

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

.github/workflows/build.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Setup Go
1818
uses: actions/setup-go@v3
1919
with:
20-
go-version: 1.17.x
20+
go-version: 1.18.x
2121
- name: Restore go cache
2222
uses: actions/cache@v3
2323
with:
@@ -41,7 +41,7 @@ jobs:
4141
- name: Setup Go
4242
uses: actions/setup-go@v3
4343
with:
44-
go-version: 1.17.x
44+
go-version: 1.18.x
4545
- name: Run tests
4646
run: make test
4747
env:
@@ -64,7 +64,7 @@ jobs:
6464
- name: Setup Go
6565
uses: actions/setup-go@v3
6666
with:
67-
go-version: 1.17.x
67+
go-version: 1.18.x
6868
- name: Restore Go cache
6969
uses: actions/cache@v3
7070
with:

DEVELOPMENT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ If any of the above dependencies are not present on your system, the first invoc
9797
## How to run the test suite
9898

9999
Prerequisites:
100-
* Go >= 1.17
100+
* Go >= 1.18
101101

102102
You can run the test suite by simply doing
103103

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG BASE_VARIANT=alpine
2-
ARG GO_VERSION=1.17
2+
ARG GO_VERSION=1.18
33
ARG XX_VERSION=1.1.0
44

55
ARG LIBGIT2_IMG=ghcr.io/fluxcd/golang-with-libgit2

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@ api-docs: gen-crd-api-reference-docs ## Generate API reference documentation
175175
$(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
176176

177177
tidy: ## Run go mod tidy
178-
cd api; rm -f go.sum; go mod tidy -compat=1.17
179-
rm -f go.sum; go mod tidy -compat=1.17
178+
cd api; rm -f go.sum; go mod tidy -compat=1.18
179+
rm -f go.sum; go mod tidy -compat=1.18
180180

181181
fmt: ## Run go fmt against code
182182
go fmt ./...

api/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/fluxcd/image-automation-controller/api
22

3-
go 1.17
3+
go 1.18
44

55
require (
66
github.com/fluxcd/pkg/apis/meta v0.14.2

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/fluxcd/image-automation-controller
22

3-
go 1.17
3+
go 1.18
44

55
replace github.com/fluxcd/image-automation-controller/api => ./api
66

tests/fuzz/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Replaced by oss_fuzz_build.sh.
33
module github.com/fluxcd/image-automation-controller/tests/fuzz
44

5-
go 1.17
5+
go 1.18
66

77
replace (
88
github.com/fluxcd/image-automation-controller/api => ../../api

tests/fuzz/oss_fuzz_build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ SOURCE_VER=$(go list -m github.com/fluxcd/source-controller/api | awk '{print $2
7777
REFLECTOR_VER=$(go list -m github.com/fluxcd/image-reflector-controller/api | awk '{print $2}')
7878

7979
go mod download
80-
go mod tidy -go=1.16 && go mod tidy -go=1.17
80+
go mod tidy -go=1.18
8181
go get -d github.com/fluxcd/image-automation-controller
8282
go get -d github.com/AdaLogics/go-fuzz-headers
8383

0 commit comments

Comments
 (0)