Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Setup Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated to match the go-version-file example here: https://github.com/actions/setup-go?tab=readme-ov-file#getting-go-version-from-the-gomod-file.

Also updated other files so actions use consistent versions.

with:
go-version: '1.17'
go-version-file: go.mod
- name: Test
run: go test -race ./...
14 changes: 10 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
module github.com/gravitational/trace

go 1.15
go 1.20
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dependencies want various increased Go versions, as follows:

These are all fairly old, past EOL Go versions. Since this is a library it makes sense to keep Go requirements as soft as can be, so I've updated trace to require 1.20. This and the security patch probably both warrant a new tag.


require (
github.com/stretchr/testify v1.8.3
golang.org/x/net v0.17.0
golang.org/x/net v0.33.0
google.golang.org/grpc v1.56.3
)

require (
golang.org/x/sys v0.15.0 // indirect
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why dependabot took out all indirects, but once I upped the Go version it all came back.

golang.org/x/text v0.14.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
google.golang.org/protobuf v1.33.0 // indirect
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

protobuf needs to be at least v1.33.0 to dodge more CVEs.

gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading