Skip to content

Commit

Permalink
Merge pull request #872 from fluxcd/go-1.21
Browse files Browse the repository at this point in the history
Update Go to 1.21
  • Loading branch information
stefanprodan authored Jan 23, 2024
2 parents 610f6e6 + d442ea3 commit df80488
Show file tree
Hide file tree
Showing 8 changed files with 53 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cifuzz.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
with:
go-version: 1.20.x
go-version: 1.21.x
cache-dependency-path: |
**/go.sum
**/go.mod
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
with:
go-version: 1.20.x
go-version: 1.21.x
cache-dependency-path: |
**/go.sum
**/go.mod
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scan.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
with:
go-version: 1.20.x
go-version: 1.21.x
cache-dependency-path: |
**/go.sum
**/go.mod
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG GO_VERSION=1.20
ARG GO_VERSION=1.21
ARG XX_VERSION=1.3.0

FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ api-docs: gen-crd-api-reference-docs
# Run go mod tidy
tidy:
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

# Run go fmt against code
fmt:
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/fluxcd/helm-controller

go 1.20
go 1.21

replace github.com/fluxcd/helm-controller/api => ./api

Expand Down
45 changes: 45 additions & 0 deletions go.sum

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions tests/fuzz/Dockerfile.builder
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
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.6.linux-amd64.tar.gz \
&& mkdir temp-go \
&& rm -rf /root/.go/* \
&& tar -C temp-go/ -xzf go1.20.5.linux-amd64.tar.gz \
&& tar -C temp-go/ -xzf go1.21.6.linux-amd64.tar.gz \
&& mv temp-go/go/* /root/.go/

ENV SRC=$GOPATH/src/github.com/fluxcd/helm-controller
Expand Down

0 comments on commit df80488

Please sign in to comment.