diff --git a/.circleci/config.yml b/.circleci/config.yml index 8c90eefd7..424fd4671 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -12,9 +12,14 @@ jobs: steps: - run: name: install dependencies + environment: + # TODO(AUT-158): installing Go differently for tests than linting is bad command: | + echo "deb http://deb.debian.org/debian/ bookworm-backports main" > /etc/apt/sources.list.d/bookworm-backports.list + echo "deb-src http://deb.debian.org/debian/ bookworm-backports main" >> /etc/apt/sources.list.d/bookworm-backports.list apt-get update - apt-get install -y golang build-essential git ca-certificates libltdl-dev + apt-get install -y golang-1.22 build-essential git ca-certificates libltdl-dev + echo 'export PATH="${PATH}:/usr/lib/go-1.22/bin"' >> $BASH_ENV - checkout - run: name: check crypto11 not used in signers @@ -38,7 +43,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: | @@ -50,7 +55,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 @@ -80,7 +85,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 diff --git a/go.mod b/go.mod index 221b13de6..206efb888 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/mozilla-services/autograph -go 1.22 +go 1.22.5 require ( github.com/DataDog/datadog-go v3.7.2+incompatible @@ -8,6 +8,7 @@ require ( 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 @@ -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