Skip to content

Commit ab24f1c

Browse files
cpanatocpanato
authored
use go1.23.2 (#1834)
Signed-off-by: cpanato <[email protected]>
1 parent 8b77b21 commit ab24f1c

File tree

7 files changed

+32
-39
lines changed

7 files changed

+32
-39
lines changed

‎.github/workflows/container-build.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,12 @@ jobs:
3636
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
3737
- uses: sigstore/cosign-installer@dc72c7d5c4d10cd6bcb8cf6e3fd625a9e5e537da # v3.7.0
3838

39-
# TODO: uncomment when we bump to go1.22 in go.mod
40-
# - name: Extract version of Go to use
41-
# run: echo "GOVERSION=$(cat Dockerfile|grep golang | awk ' { print $2 } ' | cut -d '@' -f 1 | cut -d ':' -f 2 | uniq)" >> $GITHUB_ENV
39+
- name: Extract version of Go to use
40+
run: echo "GOVERSION=$(cat Dockerfile|grep golang | awk ' { print $2 } ' | cut -d '@' -f 1 | cut -d ':' -f 2 | uniq)" >> $GITHUB_ENV
4241

4342
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
4443
with:
45-
go-version: '1.22'
44+
go-version: '${{ env.GOVERSION }}'
4645
check-latest: true
4746

4847
- name: deps

‎.github/workflows/main.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,12 @@ jobs:
3131
steps:
3232
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
3333

34-
# TODO: uncomment when we bump to go1.22 in go.mod
35-
# - name: Extract version of Go to use
36-
# run: echo "GOVERSION=$(cat Dockerfile|grep golang | awk ' { print $2 } ' | cut -d '@' -f 1 | cut -d ':' -f 2 | uniq)" >> $GITHUB_ENV
34+
- name: Extract version of Go to use
35+
run: echo "GOVERSION=$(cat Dockerfile|grep golang | awk ' { print $2 } ' | cut -d '@' -f 1 | cut -d ':' -f 2 | uniq)" >> $GITHUB_ENV
3736

3837
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
3938
with:
40-
go-version: '1.22'
39+
go-version: ${{ env.GOVERSION }}
4140
check-latest: true
4241

4342
- uses: arduino/setup-protoc@c65c819552d16ad3c9b72d9dfd5ba5237b9c906b # v3.0.0

‎.github/workflows/validate-release.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ jobs:
2828
check-signature:
2929
runs-on: ubuntu-latest
3030
container:
31-
image: ghcr.io/sigstore/cosign/cosign:v2.4.0-dev@sha256:a97b592b9f73390edcd6ceb5799a62513a906cbdffcdc63f53585910c71b0708
31+
image: ghcr.io/sigstore/cosign/cosign:v2.4.1-dev@sha256:a1bb112f1758703aa1d222bf30b9655d04cf196c0b7feaf3479d1222c2283590
3232

3333
steps:
3434
- name: Check Signature
3535
run: |
36-
cosign verify ghcr.io/gythialy/golang-cross:v1.23.1-0@sha256:08c0c74e318141737b9da97e3b110417a5d898eef617802706b725ef926497ff \
36+
cosign verify ghcr.io/gythialy/golang-cross:v1.23.2-0@sha256:8feb33a131baabdef112d924a4379ff6b0a4f00a4854f97b0dc73742198638bd \
3737
--certificate-oidc-issuer https://token.actions.githubusercontent.com \
38-
--certificate-identity "https://github.com/gythialy/golang-cross/.github/workflows/release-golang-cross.yml@refs/tags/v1.23.1-0"
38+
--certificate-identity "https://github.com/gythialy/golang-cross/.github/workflows/release-golang-cross.yml@refs/tags/v1.23.2-0"
3939
env:
4040
TUF_ROOT: /tmp
4141

@@ -44,7 +44,7 @@ jobs:
4444
needs:
4545
- check-signature
4646
container:
47-
image: ghcr.io/gythialy/golang-cross:v1.23.1-0@sha256:08c0c74e318141737b9da97e3b110417a5d898eef617802706b725ef926497ff
47+
image: ghcr.io/gythialy/golang-cross:v1.23.2-0@sha256:8feb33a131baabdef112d924a4379ff6b0a4f00a4854f97b0dc73742198638bd
4848

4949
steps:
5050
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0

‎.github/workflows/verify-k8s.yml

+6-8
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,12 @@ jobs:
2727
steps:
2828
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
2929

30-
# TODO: uncomment when we bump to go1.22 in go.mod
31-
# - name: Extract version of Go to use
32-
# run: echo "GOVERSION=$(cat Dockerfile|grep golang | awk ' { print $2 } ' | cut -d '@' -f 1 | cut -d ':' -f 2 | uniq)" >> $GITHUB_ENV
30+
- name: Extract version of Go to use
31+
run: echo "GOVERSION=$(cat Dockerfile|grep golang | awk ' { print $2 } ' | cut -d '@' -f 1 | cut -d ':' -f 2 | uniq)" >> $GITHUB_ENV
3332

3433
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
3534
with:
36-
go-version: ${{ env.GOVERSION }}
35+
go-version: '${{ env.GOVERSION }}'
3736
check-latest: true
3837

3938
- name: Install kubeval
@@ -70,13 +69,12 @@ jobs:
7069
steps:
7170
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
7271

73-
# TODO: uncomment when we bump to go1.22 in go.mod
74-
# - name: Extract version of Go to use
75-
# run: echo "GOVERSION=$(cat Dockerfile|grep golang | awk ' { print $2 } ' | cut -d '@' -f 1 | cut -d ':' -f 2 | uniq)" >> $GITHUB_ENV
72+
- name: Extract version of Go to use
73+
run: echo "GOVERSION=$(cat Dockerfile|grep golang | awk ' { print $2 } ' | cut -d '@' -f 1 | cut -d ':' -f 2 | uniq)" >> $GITHUB_ENV
7674

7775
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
7876
with:
79-
go-version: '1.22'
77+
go-version: '${{ env.GOVERSION }}'
8078
check-latest: true
8179

8280
- uses: ko-build/setup-ko@3aebd0597dc1e9d1a26bcfdb7cbeb19c131d3037 # v0.7

‎.github/workflows/verify.yml

+10-13
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,12 @@ jobs:
3131
steps:
3232
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
3333

34-
# TODO: uncomment when we bump to go1.22 in go.mod
35-
# - name: Extract version of Go to use
36-
# run: echo "GOVERSION=$(cat Dockerfile|grep golang | awk ' { print $2 } ' | cut -d '@' -f 1 | cut -d ':' -f 2 | uniq)" >> $GITHUB_ENV
34+
- name: Extract version of Go to use
35+
run: echo "GOVERSION=$(cat Dockerfile|grep golang | awk ' { print $2 } ' | cut -d '@' -f 1 | cut -d ':' -f 2 | uniq)" >> $GITHUB_ENV
3736

3837
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
3938
with:
40-
go-version: '1.22'
39+
go-version: '${{ env.GOVERSION }}'
4140
check-latest: true
4241

4342
- name: Install addlicense
@@ -58,33 +57,31 @@ jobs:
5857
- name: deps
5958
run: sudo apt-get update && sudo apt-get install -yq libpcsclite-dev
6059

61-
# TODO: uncomment when we bump to go1.22 in go.mod
62-
# - name: Extract version of Go to use
63-
# run: echo "GOVERSION=$(cat Dockerfile|grep golang | awk ' { print $2 } ' | cut -d '@' -f 1 | cut -d ':' -f 2 | uniq)" >> $GITHUB_ENV
60+
- name: Extract version of Go to use
61+
run: echo "GOVERSION=$(cat Dockerfile|grep golang | awk ' { print $2 } ' | cut -d '@' -f 1 | cut -d ':' -f 2 | uniq)" >> $GITHUB_ENV
6462

6563
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
6664
with:
67-
go-version: '1.22'
65+
go-version: '${{ env.GOVERSION }}'
6866
check-latest: true
6967

7068
- name: golangci-lint
7169
uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
7270
with:
73-
version: v1.60
71+
version: v1.61
7472

7573
oidc-config:
7674
name: oidc-config
7775
runs-on: ubuntu-latest
7876
steps:
7977
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
8078

81-
# TODO: uncomment when we bump to go1.22 in go.mod
82-
# - name: Extract version of Go to use
83-
# run: echo "GOVERSION=$(cat Dockerfile|grep golang | awk ' { print $2 } ' | cut -d '@' -f 1 | cut -d ':' -f 2 | uniq)" >> $GITHUB_ENV
79+
- name: Extract version of Go to use
80+
run: echo "GOVERSION=$(cat Dockerfile|grep golang | awk ' { print $2 } ' | cut -d '@' -f 1 | cut -d ':' -f 2 | uniq)" >> $GITHUB_ENV
8481

8582
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
8683
with:
87-
go-version: '1.22'
84+
go-version: '${{ env.GOVERSION }}'
8885
check-latest: true
8986

9087
- name: check-config

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/sigstore/fulcio
22

3-
go 1.23.1
3+
go 1.23.2
44

55
require (
66
chainguard.dev/go-grpc-kit v0.17.6

‎release/cloudbuild.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,19 @@ steps:
3232
echo "Checking out ${_GIT_TAG}"
3333
git checkout ${_GIT_TAG}
3434
35-
- name: 'ghcr.io/sigstore/cosign/cosign:v2.4.0-dev@sha256:a97b592b9f73390edcd6ceb5799a62513a906cbdffcdc63f53585910c71b0708'
35+
- name: 'ghcr.io/sigstore/cosign/cosign:v2.4.1-dev@sha256:a1bb112f1758703aa1d222bf30b9655d04cf196c0b7feaf3479d1222c2283590'
3636
dir: "go/src/sigstore/fulcio"
3737
env:
3838
- TUF_ROOT=/tmp
3939
args:
4040
- 'verify'
41-
- 'ghcr.io/gythialy/golang-cross:v1.23.1-0@sha256:08c0c74e318141737b9da97e3b110417a5d898eef617802706b725ef926497ff'
41+
- 'ghcr.io/gythialy/golang-cross:v1.23.2-0@sha256:8feb33a131baabdef112d924a4379ff6b0a4f00a4854f97b0dc73742198638bd'
4242
- '--certificate-oidc-issuer'
4343
- "https://token.actions.githubusercontent.com"
4444
- '--certificate-identity'
45-
- "https://github.com/gythialy/golang-cross/.github/workflows/release-golang-cross.yml@refs/tags/v1.23.1-0"
45+
- "https://github.com/gythialy/golang-cross/.github/workflows/release-golang-cross.yml@refs/tags/v1.23.2-0"
4646

47-
- name: ghcr.io/gythialy/golang-cross:v1.23.1-0@sha256:08c0c74e318141737b9da97e3b110417a5d898eef617802706b725ef926497ff
47+
- name: ghcr.io/gythialy/golang-cross:v1.23.2-0@sha256:8feb33a131baabdef112d924a4379ff6b0a4f00a4854f97b0dc73742198638bd
4848
entrypoint: /bin/sh
4949
dir: "go/src/sigstore/fulcio"
5050
env:
@@ -67,7 +67,7 @@ steps:
6767
gcloud auth configure-docker \
6868
&& make release
6969
70-
- name: ghcr.io/gythialy/golang-cross:v1.23.1-0@sha256:08c0c74e318141737b9da97e3b110417a5d898eef617802706b725ef926497ff
70+
- name: ghcr.io/gythialy/golang-cross:v1.23.2-0@sha256:8feb33a131baabdef112d924a4379ff6b0a4f00a4854f97b0dc73742198638bd
7171
entrypoint: 'bash'
7272
dir: "go/src/sigstore/fulcio"
7373
env:

0 commit comments

Comments
 (0)