Skip to content

Commit

Permalink
finish off Go 1.22 upgrade
Browse files Browse the repository at this point in the history
This patch cleans up some stragglers in the CircleCI config that were
still running on 1.19.

We also specify the patch version of Go in go.mod as that's what the
`1.22` tooling (and, I believe, 1.21) does. If we don't do that, various
third party tools like GitHub's CodeQL can break (see
github/codeql#15647 for the last time I ran
into this). This patch change is actually what clued me into the
CircleCI version bumps that were missing.
  • Loading branch information
jmhodges committed Jul 18, 2024
1 parent bc6317c commit 7bd92eb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
command: |
make vet
make -C tools/autograph-monitor vet
make -C verifier/contentsignature vet
make -C verifier/contentsignature vet
- run:
name: run staticcheck
command: |
Expand All @@ -50,7 +50,7 @@ jobs:
unit-test:
# based on the official golang image with more docker stuff
docker:
- image: cimg/go:1.19
- image: cimg/go:1.22
auth:
username: $DOCKER_USER
password: $DOCKER_PASS
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
build-integrationtest-verify:
# based on the official golang image with more docker stuff
docker:
- image: cimg/go:1.19
- image: cimg/go:1.22
auth:
username: $DOCKER_USER
password: $DOCKER_PASS
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
module github.com/mozilla-services/autograph

go 1.22
go 1.22.5

require (
github.com/DataDog/datadog-go v3.7.2+incompatible
github.com/ThalesIgnite/crypto11 v0.1.0
github.com/aws/aws-lambda-go v1.27.0
github.com/aws/aws-sdk-go v1.42.15
github.com/golang/mock v1.6.0
github.com/google/uuid v1.6.0
github.com/gorilla/mux v1.8.0
github.com/hashicorp/golang-lru v0.5.4
github.com/lib/pq v1.10.4
Expand Down Expand Up @@ -40,7 +41,6 @@ require (
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
github.com/golang/protobuf v1.3.2 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
github.com/goware/prefixer v0.0.0-20160118172347-395022866408 // indirect
github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c // indirect
Expand Down

0 comments on commit 7bd92eb

Please sign in to comment.