fluxcd
/
source-controller
mirror of https://github.com/fluxcd/source-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #816 from fluxcd/go-1-18 

Upgrade to Go 1.18
This commit is contained in:
Stefan Prodan 2022-07-27 19:35:58 +03:00 committed by GitHub
parent b7aa05ce66 f2772eb9d3
commit d9dfb9d79a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/e2e.yaml vendored
View File

@ -19,7 +19,7 @@ jobs:
- name: Setup Go - name: Setup Go
uses: actions/setup-go@v3 uses: actions/setup-go@v3
with: with:
go-version: 1.17.x go-version: 1.18.x
- name: Restore Go cache - name: Restore Go cache
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
@ -56,7 +56,7 @@ jobs:
- name: Setup Go - name: Setup Go
uses: actions/setup-go@v3 uses: actions/setup-go@v3
with: with:
go-version: 1.17.x go-version: 1.18.x
- name: Enable integration tests - name: Enable integration tests
# Only run integration tests for main branch # Only run integration tests for main branch
if: github.ref == 'refs/heads/main' if: github.ref == 'refs/heads/main'

6
.github/workflows/tests.yaml vendored
View File

@ -19,7 +19,7 @@ jobs:
- name: Setup Go - name: Setup Go
uses: actions/setup-go@v3 uses: actions/setup-go@v3
with: with:
go-version: 1.17.x go-version: 1.18.x
- name: Restore Go cache - name: Restore Go cache
uses: actions/cache@v3 uses: actions/cache@v3
with: with:
@ -43,7 +43,7 @@ jobs:
- name: Setup Go - name: Setup Go
uses: actions/setup-go@v3 uses: actions/setup-go@v3
with: with:
go-version: 1.17.x go-version: 1.18.x
- name: Run tests - name: Run tests
env: env:
TEST_AZURE_ACCOUNT_NAME: ${{ secrets.TEST_AZURE_ACCOUNT_NAME }} TEST_AZURE_ACCOUNT_NAME: ${{ secrets.TEST_AZURE_ACCOUNT_NAME }}
@ -72,7 +72,7 @@ jobs:
- name: Setup Go - name: Setup Go
uses: actions/setup-go@v3 uses: actions/setup-go@v3
with: with:
go-version: 1.17.x go-version: 1.18.x
- name: Restore Go cache - name: Restore Go cache
uses: actions/cache@v3 uses: actions/cache@v3
with: with:

2
.github/workflows/verify.yaml vendored
View File

@ -19,7 +19,7 @@ jobs:
- name: Setup Go - name: Setup Go
uses: actions/setup-go@v3 uses: actions/setup-go@v3
with: with:
go-version: 1.17.x go-version: 1.18.x
- name: Restore Go cache - name: Restore Go cache
uses: actions/cache@v3 uses: actions/cache@v3
with: with:

2
DEVELOPMENT.md
View File

@ -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 ## How to run the test suite
Prerequisites: Prerequisites:
* Go >= 1.17 * Go >= 1.18
You can run the test suite by simply doing You can run the test suite by simply doing

2
Dockerfile
View File

@ -1,5 +1,5 @@
ARG BASE_VARIANT=alpine ARG BASE_VARIANT=alpine
ARG GO_VERSION=1.17 ARG GO_VERSION=1.18
ARG XX_VERSION=1.1.2 ARG XX_VERSION=1.1.2
ARG LIBGIT2_IMG=ghcr.io/fluxcd/golang-with-libgit2-only ARG LIBGIT2_IMG=ghcr.io/fluxcd/golang-with-libgit2-only

4
Makefile
View File

@ -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 $(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 tidy: ## Run go mod tidy
cd api; 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.17 rm -f go.sum; go mod tidy -compat=1.18
fmt: ## Run go fmt against code fmt: ## Run go fmt against code
go fmt ./... go fmt ./...

2
api/go.mod
View File

@ -1,6 +1,6 @@
module github.com/fluxcd/source-controller/api module github.com/fluxcd/source-controller/api
go 1.17 go 1.18
require ( require (
github.com/fluxcd/pkg/apis/acl v0.0.3 github.com/fluxcd/pkg/apis/acl v0.0.3

2
go.mod
View File

@ -1,6 +1,6 @@
module github.com/fluxcd/source-controller module github.com/fluxcd/source-controller
go 1.17 go 1.18
replace github.com/fluxcd/source-controller/api => ./api replace github.com/fluxcd/source-controller/api => ./api

2
tests/fuzz/go.mod
View File

@ -1,6 +1,6 @@
module github.com/fluxcd/source-controller/tests/fuzz module github.com/fluxcd/source-controller/tests/fuzz
go 1.17 go 1.18
replace github.com/fluxcd/kustomize-controller/api => ../../api replace github.com/fluxcd/kustomize-controller/api => ../../api