Skip to content

Commit

Permalink
chore: relax go directive to permit 1.22.x
Browse files Browse the repository at this point in the history
Setting this to 1.23.4 requires all consumers to be building with the
absolute latest 1.23.4 or newer release of Go 1.23 and to update their
own go.mod accordingly — this seems unnecessarily restrictive for a
library module, particularly as the code itself doesn't currently use
any modern language constructs and builds fine even with older Go
versions.

Instead set the go directive to 1.22.0 and use the toolchain directive
to recommend the latest 1.22.x when building locally.

Note: this also upgrades google/trillian to v1.7.1 and downgrades
sigs.k8s.io/release-utils to v0.8.4, which are both required in order to
allow the go directive to be relaxed here.

Signed-off-by: Dominic Evans <dominic.evans@uk.ibm.com>
  • Loading branch information
dnwe committed Jan 9, 2025
1 parent 8f7b5a0 commit e441544
Show file tree
Hide file tree
Showing 4 changed files with 84 additions and 39 deletions.
34 changes: 25 additions & 9 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
module github.com/sigstore/rekor

go 1.23.4
go 1.22.0

toolchain go1.22.10

require (
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
Expand All @@ -16,7 +18,7 @@ require (
github.com/go-openapi/validate v0.24.0
github.com/google/go-cmp v0.6.0
github.com/google/rpmpack v0.6.0
github.com/google/trillian v1.7.0
github.com/google/trillian v1.7.1
github.com/in-toto/in-toto-golang v0.9.0
github.com/jedisct1/go-minisign v0.0.0-20211028175153-1c139d1cc84b
github.com/mitchellh/go-homedir v1.1.0
Expand All @@ -37,15 +39,15 @@ require (
go.uber.org/goleak v1.3.0
go.uber.org/zap v1.27.0
gocloud.dev v0.40.0
golang.org/x/crypto v0.31.0
golang.org/x/crypto v0.32.0
golang.org/x/mod v0.22.0
golang.org/x/net v0.33.0
golang.org/x/net v0.34.0
golang.org/x/sync v0.10.0
google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
google.golang.org/grpc v1.69.2
google.golang.org/protobuf v1.36.1
gopkg.in/ini.v1 v1.67.0
sigs.k8s.io/release-utils v0.9.0
sigs.k8s.io/release-utils v0.8.4
sigs.k8s.io/yaml v1.4.0
)

Expand Down Expand Up @@ -76,17 +78,22 @@ require (
)

require (
cel.dev/expr v0.16.2 // indirect
cloud.google.com/go/auth v0.13.0 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect
cloud.google.com/go/compute/metadata v0.6.0 // indirect
cloud.google.com/go/longrunning v0.6.2 // indirect
cloud.google.com/go/monitoring v1.21.2 // indirect
filippo.io/edwards25519 v1.1.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.3.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.0 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.3.1 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.2 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect
github.com/alessio/shellescape v1.4.1 // indirect
github.com/aws/aws-sdk-go v1.55.5 // indirect
github.com/aws/aws-sdk-go-v2 v1.32.6 // indirect
Expand All @@ -111,7 +118,11 @@ require (
github.com/aws/smithy-go v1.22.1 // indirect
github.com/cavaliergopher/cpio v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/envoyproxy/go-control-plane v0.13.1 // indirect
github.com/envoyproxy/protoc-gen-validate v1.1.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
github.com/go-jose/go-jose/v4 v4.0.2 // indirect
Expand All @@ -129,19 +140,24 @@ require (
github.com/hashicorp/vault/api v1.15.0 // indirect
github.com/jellydator/ttlcache/v3 v3.3.0 // indirect
github.com/jmespath/go-jmespath v0.4.1-0.20220621161143-b0104c826a24 // indirect
github.com/klauspost/compress v1.17.9 // indirect
github.com/klauspost/compress v1.17.11 // indirect
github.com/klauspost/pgzip v1.2.6 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/mattn/go-sqlite3 v1.14.24 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
github.com/sagikazarmark/locafero v0.4.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
go.opentelemetry.io/contrib/detectors/gcp v1.31.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
go.opentelemetry.io/otel v1.31.0 // indirect
go.opentelemetry.io/otel/metric v1.31.0 // indirect
go.opentelemetry.io/otel/sdk v1.31.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.31.0 // indirect
go.opentelemetry.io/otel/trace v1.31.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/time v0.8.0 // indirect
Expand All @@ -154,7 +170,7 @@ require (
cloud.google.com/go v0.116.0 // indirect
cloud.google.com/go/iam v1.2.2 // indirect
cloud.google.com/go/kms v1.20.2 // indirect
cloud.google.com/go/storage v1.43.0 // indirect
cloud.google.com/go/storage v1.45.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cavaliercoder/badio v0.0.0-20160213150051-ce5280129e9e // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
Expand Down Expand Up @@ -199,8 +215,8 @@ require (
go.step.sm/crypto v0.56.0
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/oauth2 v0.24.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/term v0.27.0 // indirect
golang.org/x/sys v0.29.0 // indirect
golang.org/x/term v0.28.0 // indirect
golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect
google.golang.org/api v0.214.0
gopkg.in/yaml.v2 v2.4.0
Expand Down
Loading

0 comments on commit e441544

Please sign in to comment.