Skip to content

Commit d9dfb9d

Browse files
authored
Merge pull request #816 from fluxcd/go-1-18
Upgrade to Go 1.18
2 parents b7aa05c + f2772eb commit d9dfb9d

File tree

9 files changed

+13
-13
lines changed

9 files changed

+13
-13
lines changed

.github/workflows/e2e.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Setup Go
2020
uses: actions/setup-go@v3
2121
with:
22-
go-version: 1.17.x
22+
go-version: 1.18.x
2323
- name: Restore Go cache
2424
uses: actions/cache@v3
2525
with:
@@ -56,7 +56,7 @@ jobs:
5656
- name: Setup Go
5757
uses: actions/setup-go@v3
5858
with:
59-
go-version: 1.17.x
59+
go-version: 1.18.x
6060
- name: Enable integration tests
6161
# Only run integration tests for main branch
6262
if: github.ref == 'refs/heads/main'

.github/workflows/tests.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Setup Go
2020
uses: actions/setup-go@v3
2121
with:
22-
go-version: 1.17.x
22+
go-version: 1.18.x
2323
- name: Restore Go cache
2424
uses: actions/cache@v3
2525
with:
@@ -43,7 +43,7 @@ jobs:
4343
- name: Setup Go
4444
uses: actions/setup-go@v3
4545
with:
46-
go-version: 1.17.x
46+
go-version: 1.18.x
4747
- name: Run tests
4848
env:
4949
TEST_AZURE_ACCOUNT_NAME: ${{ secrets.TEST_AZURE_ACCOUNT_NAME }}
@@ -72,7 +72,7 @@ jobs:
7272
- name: Setup Go
7373
uses: actions/setup-go@v3
7474
with:
75-
go-version: 1.17.x
75+
go-version: 1.18.x
7676
- name: Restore Go cache
7777
uses: actions/cache@v3
7878
with:

.github/workflows/verify.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Setup Go
2020
uses: actions/setup-go@v3
2121
with:
22-
go-version: 1.17.x
22+
go-version: 1.18.x
2323
- name: Restore Go cache
2424
uses: actions/cache@v3
2525
with:

DEVELOPMENT.md

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

4747
Prerequisites:
48-
* Go >= 1.17
48+
* Go >= 1.18
4949

5050
You can run the test suite by simply doing
5151

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.2
44

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

Makefile

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

127127
tidy: ## Run go mod tidy
128-
cd api; rm -f go.sum; go mod tidy -compat=1.17
129-
rm -f go.sum; go mod tidy -compat=1.17
128+
cd api; rm -f go.sum; go mod tidy -compat=1.18
129+
rm -f go.sum; go mod tidy -compat=1.18
130130

131131
fmt: ## Run go fmt against code
132132
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/source-controller/api
22

3-
go 1.17
3+
go 1.18
44

55
require (
66
github.com/fluxcd/pkg/apis/acl v0.0.3

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/source-controller
22

3-
go 1.17
3+
go 1.18
44

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

tests/fuzz/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/source-controller/tests/fuzz
22

3-
go 1.17
3+
go 1.18
44

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

0 commit comments

Comments
 (0)