Build with Go 1.21
Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
This commit is contained in:
parent
71806b51ed
commit
2feec3198b
|
@ -21,7 +21,7 @@ jobs:
|
||||||
- name: Setup Go
|
- name: Setup Go
|
||||||
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
|
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
|
||||||
with:
|
with:
|
||||||
go-version: 1.20.x
|
go-version: 1.21.x
|
||||||
cache-dependency-path: |
|
cache-dependency-path: |
|
||||||
**/go.sum
|
**/go.sum
|
||||||
**/go.mod
|
**/go.mod
|
||||||
|
|
|
@ -24,7 +24,7 @@ jobs:
|
||||||
- name: Setup Go
|
- name: Setup Go
|
||||||
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
|
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
|
||||||
with:
|
with:
|
||||||
go-version: 1.20.x
|
go-version: 1.21.x
|
||||||
cache-dependency-path: |
|
cache-dependency-path: |
|
||||||
**/go.sum
|
**/go.sum
|
||||||
**/go.mod
|
**/go.mod
|
||||||
|
@ -59,7 +59,7 @@ jobs:
|
||||||
- name: Setup Go
|
- name: Setup Go
|
||||||
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
|
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
|
||||||
with:
|
with:
|
||||||
go-version: 1.20.x
|
go-version: 1.21.x
|
||||||
cache-dependency-path: |
|
cache-dependency-path: |
|
||||||
**/go.sum
|
**/go.sum
|
||||||
**/go.mod
|
**/go.mod
|
||||||
|
|
|
@ -35,7 +35,7 @@ jobs:
|
||||||
- name: Setup Go
|
- name: Setup Go
|
||||||
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
|
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
|
||||||
with:
|
with:
|
||||||
go-version: 1.20.x
|
go-version: 1.21.x
|
||||||
cache-dependency-path: |
|
cache-dependency-path: |
|
||||||
**/go.sum
|
**/go.sum
|
||||||
**/go.mod
|
**/go.mod
|
||||||
|
|
|
@ -25,7 +25,7 @@ jobs:
|
||||||
- name: Setup Go
|
- name: Setup Go
|
||||||
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
|
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
|
||||||
with:
|
with:
|
||||||
go-version: 1.20.x
|
go-version: 1.21.x
|
||||||
cache-dependency-path: |
|
cache-dependency-path: |
|
||||||
**/go.sum
|
**/go.sum
|
||||||
**/go.mod
|
**/go.mod
|
||||||
|
@ -46,7 +46,7 @@ jobs:
|
||||||
- name: Setup Go
|
- name: Setup Go
|
||||||
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
|
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
|
||||||
with:
|
with:
|
||||||
go-version: 1.20.x
|
go-version: 1.21.x
|
||||||
cache-dependency-path: |
|
cache-dependency-path: |
|
||||||
**/go.sum
|
**/go.sum
|
||||||
**/go.mod
|
**/go.mod
|
||||||
|
|
|
@ -25,7 +25,7 @@ jobs:
|
||||||
- name: Setup Go
|
- name: Setup Go
|
||||||
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
|
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
|
||||||
with:
|
with:
|
||||||
go-version: 1.20.x
|
go-version: 1.21.x
|
||||||
cache-dependency-path: |
|
cache-dependency-path: |
|
||||||
**/go.sum
|
**/go.sum
|
||||||
**/go.mod
|
**/go.mod
|
||||||
|
|
|
@ -15,7 +15,7 @@ There are a number of dependencies required to be able to run the controller and
|
||||||
|
|
||||||
In addition to the above, the following dependencies are also used by some of the `make` targets:
|
In addition to the above, the following dependencies are also used by some of the `make` targets:
|
||||||
|
|
||||||
- `controller-gen` (v0.7.0)
|
- `controller-gen` (v0.12.0)
|
||||||
- `gen-crd-api-reference-docs` (v0.3.0)
|
- `gen-crd-api-reference-docs` (v0.3.0)
|
||||||
- `setup-envtest` (latest)
|
- `setup-envtest` (latest)
|
||||||
|
|
||||||
|
@ -24,7 +24,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.18
|
* Go >= 1.21
|
||||||
|
|
||||||
You can run the test suite by simply doing
|
You can run the test suite by simply doing
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
ARG BASE_VARIANT=alpine
|
ARG BASE_VARIANT=alpine
|
||||||
ARG GO_VERSION=1.20
|
ARG GO_VERSION=1.21
|
||||||
ARG XX_VERSION=1.2.1
|
ARG XX_VERSION=1.2.1
|
||||||
|
|
||||||
FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
|
FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
|
||||||
|
|
2
Makefile
2
Makefile
|
@ -119,7 +119,7 @@ api-docs: gen-crd-api-reference-docs ## Generate API reference documentation
|
||||||
|
|
||||||
tidy: ## Run go mod tidy
|
tidy: ## Run go mod tidy
|
||||||
cd api; rm -f go.sum; go mod tidy -compat=1.20
|
cd api; rm -f go.sum; go mod tidy -compat=1.20
|
||||||
rm -f go.sum; go mod tidy -compat=1.20
|
rm -f go.sum; go mod tidy -compat=1.21
|
||||||
|
|
||||||
fmt: ## Run go fmt against code
|
fmt: ## Run go fmt against code
|
||||||
go fmt ./...
|
go fmt ./...
|
||||||
|
|
2
go.mod
2
go.mod
|
@ -1,6 +1,6 @@
|
||||||
module github.com/fluxcd/source-controller
|
module github.com/fluxcd/source-controller
|
||||||
|
|
||||||
go 1.20
|
go 1.21
|
||||||
|
|
||||||
replace github.com/fluxcd/source-controller/api => ./api
|
replace github.com/fluxcd/source-controller/api => ./api
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
FROM gcr.io/oss-fuzz-base/base-builder-go
|
FROM gcr.io/oss-fuzz-base/base-builder-go
|
||||||
|
|
||||||
RUN wget https://go.dev/dl/go1.20.5.linux-amd64.tar.gz \
|
RUN wget https://go.dev/dl/go1.21.3.linux-amd64.tar.gz \
|
||||||
&& mkdir temp-go \
|
&& mkdir temp-go \
|
||||||
&& rm -rf /root/.go/* \
|
&& rm -rf /root/.go/* \
|
||||||
&& tar -C temp-go/ -xzf go1.20.5.linux-amd64.tar.gz \
|
&& tar -C temp-go/ -xzf go1.21.3.linux-amd64.tar.gz \
|
||||||
&& mv temp-go/go/* /root/.go/
|
&& mv temp-go/go/* /root/.go/
|
||||||
|
|
||||||
ENV SRC=$GOPATH/src/github.com/fluxcd/source-controller
|
ENV SRC=$GOPATH/src/github.com/fluxcd/source-controller
|
||||||
|
|
Loading…
Reference in New Issue