Skip to content

Commit

Permalink
chore: update go version to 1.22
Browse files Browse the repository at this point in the history
Update all go.mod files to use 1.22, and update the peripherals (release
workflow, docker files).

Signed-off-by: crozzy <[email protected]>
  • Loading branch information
crozzy committed Sep 19, 2024
1 parent 9333770 commit 89ebd52
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cut-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: 'ubuntu-latest'
strategy:
matrix:
image: ['quay.io/projectquay/golang:1.21']
image: ['quay.io/projectquay/golang:1.22']
container:
image: ${{ matrix.image }}
outputs:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# limitations under the License.

ARG GOTOOLCHAIN=local
ARG GO_VERSION=1.21
ARG GO_VERSION=1.22

Check failure on line 18 in Dockerfile

View workflow job for this annotation

GitHub Actions / Lints

Go Version Skew

Go version does not match `go.mod`: want go 1.22

Check failure on line 18 in Dockerfile

View workflow job for this annotation

GitHub Actions / Lints

Go Version Skew

Go version does not match `go.mod`: want go 1.22
FROM --platform=$BUILDPLATFORM quay.io/projectquay/golang:${GO_VERSION} AS build
WORKDIR /build
RUN --mount=type=cache,target=/root/.cache/go-build \
Expand Down
2 changes: 1 addition & 1 deletion config/go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module github.com/quay/clair/config

go 1.21.9
go 1.22

require github.com/google/go-cmp v0.6.0
1 change: 1 addition & 0 deletions contrib/openshift/build_and_deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ done
GIT_HASH="$(git rev-parse --short=7 HEAD)"
tags=("${IMAGE}:latest" "${IMAGE}:${GIT_HASH}")
trap 'rm -rf clair-v*.{tar*,oci} ' ERR
export GOTOOLCHAIN=auto # have any local invocations of go use the correct version magically

patch_source() {
in=$1
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: "3.7"
# This is just to hold a bunch of yaml anchors and try to consolidate parts of
# the config.
x-anchors:
go: &go-image quay.io/projectquay/golang:1.21
go: &go-image quay.io/projectquay/golang:1.22

Check failure on line 6 in docker-compose.yaml

View workflow job for this annotation

GitHub Actions / Lints

Go Version Skew

Go version does not match `go.mod`: want go 1.22

Check failure on line 6 in docker-compose.yaml

View workflow job for this annotation

GitHub Actions / Lints

Go Version Skew

Go version does not match `go.mod`: want go 1.22
grafana: &grafana-image docker.io/grafana/grafana:8.0.3
jaeger: &jaeger-image docker.io/jaegertracing/all-in-one:1.26
pgadmin: &pgadmin-image docker.io/dpage/pgadmin4:5.7
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/quay/clair/v4

go 1.21.9
go 1.22

require (
github.com/Masterminds/semver v1.5.0
Expand Down

0 comments on commit 89ebd52

Please sign in to comment.