Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

codeql problem avoidance #925

Closed
wants to merge 8 commits into from
Closed

codeql problem avoidance #925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7bd92eb
finish off Go 1.22 upgrade
jmhodges Jul 18, 2024
be8bf59
use go image for vet code
jmhodges Jul 18, 2024
eff92da
back to bookworm
jmhodges Jul 18, 2024
52ea30e
add backports
jmhodges Jul 18, 2024
22e6666
try exporting PATH
jmhodges Jul 18, 2024
7e7a0c2
correct Go PATH
jmhodges Jul 18, 2024
032d99a
try environment across all steps
jmhodges Jul 18, 2024
3e6254d
PATH was empty, so try BASH_ENV
jmhodges Jul 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: |
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
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
Loading