Skip to content

Commit

Permalink
bump Go to 1.22
Browse files Browse the repository at this point in the history
  • Loading branch information
nojnhuh committed Jul 9, 2024
1 parent 2bc9024 commit 8138d4e
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cover.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
with:
go-version: '1.21'
go-version: '1.22'
- run: "PATH=/usr/local/go/bin:$PATH make test-cover"
- uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependabot-code-gen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
with:
go-version: '1.21'
go-version: '1.22'
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ jobs:
- name: Setup go
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
with:
go-version: 1.21
go-version: 1.22
- name: Run verify container script
run: make verify-container-images
6 changes: 3 additions & 3 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,11 +123,11 @@ linters-settings:
arguments:
- disableStutteringCheck
staticcheck:
go: "1.21"
go: "1.22"
stylecheck:
go: "1.21"
go: "1.22"
unused:
go: "1.21"
go: "1.22"

issues:
exclude-rules:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
ARG ARCH

# Build the manager binary
FROM golang:1.21 as builder
FROM golang:1.22 as builder
WORKDIR /workspace

# Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ delete-workload-cluster: $(KUBECTL) ## Deletes the example workload Kubernetes c
.PHONY: docker-pull-prerequisites
docker-pull-prerequisites: ## Pull prerequisites for building controller-manager.
docker pull docker/dockerfile:1.4
docker pull docker.io/library/golang:1.21
docker pull docker.io/library/golang:1.22
docker pull gcr.io/distroless/static:latest

.PHONY: docker-build
Expand Down Expand Up @@ -647,7 +647,7 @@ release-binary: $(RELEASE_DIR) ## Compile and build release binaries.
-e GOARCH=$(GOARCH) \
-v "$$(pwd):/workspace" \
-w /workspace \
golang:1.21 \
golang:1.22 \
go build -a -ldflags '$(LDFLAGS) -extldflags "-static"' \
-o $(RELEASE_DIR)/$(notdir $(RELEASE_BINARY))-$(GOOS)-$(GOARCH) $(RELEASE_BINARY)

Expand Down
2 changes: 1 addition & 1 deletion Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ def validate_auth():

tilt_helper_dockerfile_header = """
# Tilt image
FROM golang:1.21 as tilt-helper
FROM golang:1.22 as tilt-helper
# Support live reloading with Tilt
RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/restart.sh && \
wget --output-document /start.sh --quiet https://raw.githubusercontent.com/windmilleng/rerun-process-wrapper/master/start.sh && \
Expand Down
4 changes: 2 additions & 2 deletions config/aso/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ patches:
name: azureserviceoperator-system
- patch: |-
- op: test
path: /spec/template/spec/containers/0/args/4
path: /spec/template/spec/containers/0/args/6
value: --crd-pattern=
- op: replace # Users can specify additional ASO CRDs. CRDs should be appended with ';'
path: /spec/template/spec/containers/0/args/4
path: /spec/template/spec/containers/0/args/6
value: --crd-pattern=${ADDITIONAL_ASO_CRDS:= }
target:
group: apps
Expand Down
2 changes: 1 addition & 1 deletion docs/book/src/developers/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
### Base requirements

1. Install [go][go]
- Get the latest patch version for go v1.21.
- Get the latest patch version for go v1.22.
2. Install [jq][jq]
- `brew install jq` on macOS.
- `sudo apt install jq` on Windows + WSL2
Expand Down
2 changes: 1 addition & 1 deletion hack/ensure-go.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ EOF
local go_version
IFS=" " read -ra go_version <<< "$(go version)"
local minimum_go_version
minimum_go_version=go1.21.9
minimum_go_version=go1.22.5
if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${go_version[2]}" != "devel" ]]; then
cat <<EOF
Detected go version: ${go_version[*]}.
Expand Down
2 changes: 1 addition & 1 deletion netlify.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
publish = "docs/book/bookout"

[build.environment]
GO_VERSION = "1.21"
GO_VERSION = "1.22.x"

# Standard Netlify redirects
[[redirects]]
Expand Down

0 comments on commit 8138d4e

Please sign in to comment.