Skip to content

Commit

Permalink
Bump golang to 1.22
Browse files Browse the repository at this point in the history
  • Loading branch information
NymanRobin committed Jul 30, 2024
1 parent 329657d commit 459916f
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
- name: Install go
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
with:
go-version: '1.20'
go-version: '1.22'
- name: Generate release notes
run: |
make release-notes
Expand Down
8 changes: 4 additions & 4 deletions .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ linters:

linters-settings:
gosec:
go: "1.20"
go: "1.22"
severity: medium
confidence: medium
concurrency: 8
Expand Down Expand Up @@ -76,9 +76,9 @@ linters-settings:
allow-leading-space: false
require-specific: true
staticcheck:
go: "1.20"
go: "1.22"
stylecheck:
go: "1.20"
go: "1.22"
gocritic:
enabled-tags:
- experimental
Expand All @@ -97,7 +97,7 @@ linters-settings:
- whyNoLint
- wrapperFunc
unused:
go: "1.20"
go: "1.22"
issues:
exclude-rules:
- path: test/e2e
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Support FROM override
ARG BUILD_IMAGE=docker.io/golang:1.21.11@sha256:a8edec58ba598e2f1259f4ec4ca1b06358468214225e73d7c841ab0980c12367
ARG BUILD_IMAGE=docker.io/golang:1.22.5@sha256:f47a7952d08277f9816459d851319c9041637022f04517388d9f32e384fc2dab
ARG BASE_IMAGE=gcr.io/distroless/static:nonroot@sha256:9ecc53c269509f63c69a266168e4a687c7eb8c0cfd753bd8bfcaa4f58a90876f

# Build the manager binary
Expand Down
2 changes: 1 addition & 1 deletion Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def validate_auth():

tilt_helper_dockerfile_header = """
# Tilt image
FROM golang:1.20 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
2 changes: 1 addition & 1 deletion hack/e2e/ensure_go.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -eux

MINIMUM_GO_VERSION=go1.21.11
MINIMUM_GO_VERSION=go1.22.5

# Ensure the go tool exists and is a viable version, or installs it
verify_go_version()
Expand Down
2 changes: 1 addition & 1 deletion hack/generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ else
--volume "${PWD}:/go/src/github.com/metal3-io/baremetal-operator:rw,z" \
--entrypoint sh \
--workdir /go/src/github.com/metal3-io/baremetal-operator \
docker.io/golang:1.20 \
docker.io/golang:1.22 \
/go/src/github.com/metal3-io/baremetal-operator/hack/generate.sh "${@}"
fi;
2 changes: 1 addition & 1 deletion hack/gofmt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ else
--volume "${PWD}:/workdir:rw,z" \
--entrypoint sh \
--workdir /workdir \
docker.io/golang:1.20 \
docker.io/golang:1.22 \
/workdir/hack/gofmt.sh "${@}"
fi;
2 changes: 1 addition & 1 deletion hack/golint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ else
--volume "${PWD}:/go/src/github.com/metal3-io/baremetal-operator:rw,z" \
--entrypoint sh \
--workdir /go/src/github.com/metal3-io/baremetal-operator \
docker.io/golang:1.20 \
docker.io/golang:1.22 \
/go/src/github.com/metal3-io/baremetal-operator/hack/golint.sh "${@}"
fi;
2 changes: 1 addition & 1 deletion hack/gomod.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ else
--volume "${PWD}:/workdir:ro,z" \
--entrypoint sh \
--workdir /workdir \
docker.io/golang:1.20 \
docker.io/golang:1.22 \
/workdir/hack/gomod.sh "$@"
fi
2 changes: 1 addition & 1 deletion hack/unit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ else
--volume "${PWD}:/go/src/github.com/metal3-io/baremetal-operator:rw,z" \
--entrypoint sh \
--workdir /go/src/github.com/metal3-io/baremetal-operator \
docker.io/golang:1.20 \
docker.io/golang:1.22 \
/go/src/github.com/metal3-io/baremetal-operator/hack/unit.sh "${@}"
fi;

0 comments on commit 459916f

Please sign in to comment.