Skip to content

Commit 277f5d7

Browse files
authored
update missing places that was using go1.20 (#1163)
* update missing places that was using go1.20 Signed-off-by: cpanato <[email protected]> * use go-version-file: 'go.mod' in actions/setup-go Signed-off-by: cpanato <[email protected]> * use golang:latest Signed-off-by: cpanato <[email protected]> * update go.mod to go1.21 Signed-off-by: cpanato <[email protected]> * drop codecov Signed-off-by: cpanato <[email protected]> * fix checkout order Signed-off-by: cpanato <[email protected]> * moar fixes Signed-off-by: cpanato <[email protected]> --------- Signed-off-by: cpanato <[email protected]>
1 parent b8b3b21 commit 277f5d7

15 files changed

+63
-55
lines changed

.codecov.yaml

-21
This file was deleted.

.github/workflows/e2e.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
2222
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
2323
with:
24-
go-version: '1.20'
24+
go-version-file: 'go.mod'
2525
check-latest: true
2626

2727
- name: Build and run ko container

.github/workflows/image.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
1919
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
2020
with:
21-
go-version: '1.21'
21+
go-version-file: 'go.mod'
2222
check-latest: true
2323
- uses: sigstore/cosign-installer@11086d25041f77fe8fe7b9ea4e48e3b9192b8f19 # v3.1.2
2424

.github/workflows/kind-e2e.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ jobs:
1919
KO_DOCKER_REPO: registry.local:5000/ko
2020

2121
steps:
22+
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
23+
2224
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
2325
with:
24-
go-version: '1.21'
26+
go-version-file: 'go.mod'
2527
check-latest: true
2628

27-
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
28-
2929
- name: Install ko
3030
run: go install ./
3131

.github/workflows/modules-integration-test.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ jobs:
1616

1717
runs-on: 'ubuntu-latest'
1818
steps:
19+
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
20+
1921
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
2022
with:
2123
go-version: ${{ matrix.go-version }}
2224
check-latest: true
2325

24-
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
25-
2626
- env:
2727
GOPATH: does not matter
2828
run: ./integration_test.sh

.github/workflows/registries.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
1717
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
1818
with:
19-
go-version: '1.21'
19+
go-version-file: 'go.mod'
2020
check-latest: true
2121
- env:
2222
QUAY_USERNAME: ko-testing+test
@@ -34,7 +34,7 @@ jobs:
3434
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
3535
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
3636
with:
37-
go-version: '1.21'
37+
go-version-file: 'go.mod'
3838
check-latest: true
3939
- env:
4040
DOCKERHUB_USERNAME: kotesting
@@ -64,7 +64,7 @@ jobs:
6464
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
6565
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
6666
with:
67-
go-version: '1.21'
67+
go-version-file: 'go.mod'
6868
check-latest: true
6969

7070
- name: Install ko

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
2626
with:
27-
go-version: '1.21'
27+
go-version-file: 'go.mod'
2828
check-latest: true
2929

3030
# This installs the current latest release.

.github/workflows/sbom.yaml

+7-6
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ jobs:
1717
KO_DOCKER_REPO: localhost:1338
1818

1919
steps:
20+
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
2021
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
2122
with:
22-
go-version: '1.21'
23+
go-version-file: 'go.mod'
2324
check-latest: true
2425
- uses: chainguard-dev/actions/setup-registry@main
2526
- uses: sigstore/cosign-installer@11086d25041f77fe8fe7b9ea4e48e3b9192b8f19 # v3.1.2
26-
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
2727

2828
- name: Install CycloneDX
2929
run: |
@@ -49,13 +49,13 @@ jobs:
4949
KO_DOCKER_REPO: localhost:1338
5050

5151
steps:
52+
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
5253
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
5354
with:
54-
go-version: '1.20'
55+
go-version-file: 'go.mod'
5556
check-latest: true
5657
- uses: chainguard-dev/actions/setup-registry@main
5758
- uses: sigstore/cosign-installer@11086d25041f77fe8fe7b9ea4e48e3b9192b8f19 # v3.1.2
58-
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
5959

6060
- name: Install SPDX Tools
6161
run: |
@@ -81,13 +81,14 @@ jobs:
8181
KO_DOCKER_REPO: localhost:1338
8282

8383
steps:
84+
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
85+
8486
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
8587
with:
86-
go-version: '1.21'
88+
go-version-file: 'go.mod'
8789
check-latest: true
8890
- uses: chainguard-dev/actions/setup-registry@main
8991
- uses: sigstore/cosign-installer@11086d25041f77fe8fe7b9ea4e48e3b9192b8f19 # v3.1.2
90-
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
9192

9293
- name: Install SPDX Tools
9394
run: |

.github/workflows/style.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ jobs:
1111
name: check gofmt
1212
runs-on: ubuntu-latest
1313
steps:
14+
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
1415
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
1516
with:
16-
go-version: '1.21'
17+
go-version-file: 'go.mod'
1718
check-latest: true
18-
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
1919
- uses: chainguard-dev/actions/gofmt@d886686603afb809f7ef9b734b333e20b7ce5cda
2020
with:
2121
args: -s
@@ -24,27 +24,27 @@ jobs:
2424
name: check goimports
2525
runs-on: ubuntu-latest
2626
steps:
27+
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
2728
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
2829
with:
29-
go-version: '1.21'
30+
go-version-file: 'go.mod'
3031
check-latest: true
31-
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
3232
- uses: chainguard-dev/actions/goimports@d886686603afb809f7ef9b734b333e20b7ce5cda
3333

3434
lint:
3535
name: Lint
3636
runs-on: ubuntu-latest
3737

3838
steps:
39+
- name: Check out code
40+
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
41+
3942
- name: Set up Go
4043
uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
4144
with:
42-
go-version: '1.21'
45+
go-version-file: 'go.mod'
4346
check-latest: true
4447

45-
- name: Check out code
46-
uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
47-
4848
- uses: chainguard-dev/actions/trailing-space@d886686603afb809f7ef9b734b333e20b7ce5cda
4949
if: ${{ always() }}
5050

.github/workflows/test.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ jobs:
1818
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
1919
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
2020
with:
21-
go-version: '1.21'
21+
go-version-file: 'go.mod'
2222
check-latest: true
2323

2424
- run: go test -coverprofile=coverage.txt -covermode=atomic -race ./...
25-
26-
- uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4

.github/workflows/verify.yaml

+5-3
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@ jobs:
1010
name: Verify Codegen
1111
runs-on: ubuntu-latest
1212
steps:
13+
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
14+
1315
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
1416
with:
15-
go-version: '1.21'
17+
go-version-file: 'go.mod'
1618
check-latest: true
17-
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
19+
1820
- name: Verify
1921
run: ./hack/presubmit.sh
2022

@@ -25,7 +27,7 @@ jobs:
2527
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
2628
- uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
2729
with:
28-
go-version: '1.21'
30+
go-version-file: 'go.mod'
2931
check-latest: true
3032
- name: golangci-lint
3133
uses: golangci/golangci-lint-action@3a919529898de77ec3da873e3063ca4b10e7f5cc # v3.7.0

.goreleaser.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ kos:
3030
- id: ko-image
3131
build: binary
3232
main: .
33-
base_image: golang:1.20
33+
base_image: golang:latest
3434
ldflags:
3535
- "-s -w -X github.com/google/ko/pkg/commands.Version={{.Version}}"
3636
platforms:

.ko.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
baseImageOverrides:
2-
github.com/google/ko: golang:1.21
2+
github.com/google/ko: golang:latest
33

44
builds:
55
- id: ko

go.mod

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

3-
go 1.20
3+
go 1.21
44

55
require (
66
github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20220517224237-e6f29200ae04

0 commit comments

Comments
 (0)