From 8fc4eeb8f7af998617627d9b33be79f8a73fac44 Mon Sep 17 00:00:00 2001 From: Dominic Evans <8060970+dnwe@users.noreply.github.com> Date: Fri, 22 Nov 2024 16:13:31 +0000 Subject: [PATCH] fix: set go module directive to 1.22.0 (#1878) Signed-off-by: Ramon Petgrave --- .github/workflows/codeql.yml | 17 ++++++++++------- .github/workflows/e2e_test.yml | 11 ++++++++--- go.mod | 2 +- hack/tools/go.mod | 2 +- pkg/signature/kms/aws/go.mod | 2 +- pkg/signature/kms/azure/go.mod | 2 +- pkg/signature/kms/gcp/go.mod | 2 +- pkg/signature/kms/hashivault/go.mod | 2 +- test/fuzz/go.mod | 3 ++- 9 files changed, 26 insertions(+), 17 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 88235cca7..c665e3cc2 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -16,10 +16,10 @@ name: CodeQL on: push: - branches: [ main ] + branches: [main] pull_request: # The branches below must be a subset of the branches above - branches: [ main ] + branches: [main] permissions: contents: read @@ -29,19 +29,22 @@ jobs: analyze: name: Analyze runs-on: ubuntu-latest - strategy: fail-fast: false matrix: - language: [ 'go' ] + language: ["go"] steps: - - name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + + - name: Get Go version directive from go.mod as major.minor + id: go_version + run: | + awk -F'[ .]' '/^go /{print "version=" $2 "." $3; exit}' go.mod >>"${GITHUB_OUTPUT}" - name: Set up Go uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 with: - go-version-file: go.mod + go-version: "${{ steps.go_version.outputs.version }}" check-latest: true # Initializes the CodeQL tools for scanning. diff --git a/.github/workflows/e2e_test.yml b/.github/workflows/e2e_test.yml index 44a61618d..6ce0d3593 100644 --- a/.github/workflows/e2e_test.yml +++ b/.github/workflows/e2e_test.yml @@ -17,9 +17,9 @@ name: test on: push: - branches: [ main ] + branches: [main] pull_request: - branches: [ main ] + branches: [main] permissions: contents: read @@ -31,10 +31,15 @@ jobs: steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - name: Get Go version directive from go.mod as major.minor + id: go_version + run: | + awk -F'[ .]' '/^go /{print "version=" $2 "." $3; exit}' go.mod >>"${GITHUB_OUTPUT}" + - name: Set up Go uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0 with: - go-version-file: go.mod + go-version: "${{ steps.go_version.outputs.version }}" check-latest: true - name: Cache Modules diff --git a/go.mod b/go.mod index 52904020b..0f96c7931 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/sigstore/sigstore -go 1.22.8 +go 1.22.0 require ( github.com/coreos/go-oidc/v3 v3.11.0 diff --git a/hack/tools/go.mod b/hack/tools/go.mod index d08ec9d96..e33634cac 100644 --- a/hack/tools/go.mod +++ b/hack/tools/go.mod @@ -1,6 +1,6 @@ module github.com/sigstore/sigstore/hack/tools -go 1.22.7 +go 1.22.0 require ( github.com/AdaLogics/go-fuzz-headers v0.0.0-20211123104302-8fea106b46e2 diff --git a/pkg/signature/kms/aws/go.mod b/pkg/signature/kms/aws/go.mod index f1ce5a5e2..d80795f46 100644 --- a/pkg/signature/kms/aws/go.mod +++ b/pkg/signature/kms/aws/go.mod @@ -2,7 +2,7 @@ module github.com/sigstore/sigstore/pkg/signature/kms/aws replace github.com/sigstore/sigstore => ../../../../ -go 1.22.8 +go 1.22.0 require ( github.com/aws/aws-sdk-go v1.55.5 diff --git a/pkg/signature/kms/azure/go.mod b/pkg/signature/kms/azure/go.mod index 66aa088c9..bdcb47da9 100644 --- a/pkg/signature/kms/azure/go.mod +++ b/pkg/signature/kms/azure/go.mod @@ -2,7 +2,7 @@ module github.com/sigstore/sigstore/pkg/signature/kms/azure replace github.com/sigstore/sigstore => ../../../../ -go 1.22.8 +go 1.22.0 require ( github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0 diff --git a/pkg/signature/kms/gcp/go.mod b/pkg/signature/kms/gcp/go.mod index d626e2a1b..f4da3c911 100644 --- a/pkg/signature/kms/gcp/go.mod +++ b/pkg/signature/kms/gcp/go.mod @@ -2,7 +2,7 @@ module github.com/sigstore/sigstore/pkg/signature/kms/gcp replace github.com/sigstore/sigstore => ../../../../ -go 1.22.8 +go 1.22.0 require ( cloud.google.com/go/kms v1.20.1 diff --git a/pkg/signature/kms/hashivault/go.mod b/pkg/signature/kms/hashivault/go.mod index cbc2036ba..8ee14cb64 100644 --- a/pkg/signature/kms/hashivault/go.mod +++ b/pkg/signature/kms/hashivault/go.mod @@ -2,7 +2,7 @@ module github.com/sigstore/sigstore/pkg/signature/kms/hashivault replace github.com/sigstore/sigstore => ../../../../ -go 1.22.8 +go 1.22.0 require ( github.com/hashicorp/vault/api v1.15.0 diff --git a/test/fuzz/go.mod b/test/fuzz/go.mod index 5977bc006..48ea67db2 100644 --- a/test/fuzz/go.mod +++ b/test/fuzz/go.mod @@ -1,6 +1,7 @@ module github.com/sigstore/sigstore/test/fuzz -go 1.22.7 +go 1.22.0 + require ( github.com/AdaLogics/go-fuzz-headers v0.0.0-20211102141018-f7be0cbad29c github.com/dvyukov/go-fuzz v0.0.0-20210914135545-4980593459a1