Skip to content

Commit 32e1f55

Browse files
AkihiroSudaAkihiroSuda
authored
Merge pull request containerd#4160 from apostasie/ci-2025-04-ci-cleanup-b2
[CI]: cleanup, breakout 2: small cleanups and fixes
2 parents 017e286 + 9dcda7b commit 32e1f55

File tree

6 files changed

+28
-19
lines changed

6 files changed

+28
-19
lines changed

‎.github/workflows/lint.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
pull_request:
99

1010
env:
11-
GO_VERSION: 1.24.x
11+
GO_VERSION: "1.24"
1212
GOTOOLCHAIN: local
1313

1414
jobs:
@@ -48,7 +48,8 @@ jobs:
4848
. ./hack/provisioning/version/fetch.sh
4949
printf "GO_VERSION=%s\n" "$(go::canary::for::go-setup)" >> "$GITHUB_ENV"
5050
fi
51-
- uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
51+
- name: "Install go"
52+
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
5253
with:
5354
go-version: ${{ env.GO_VERSION }}
5455
check-latest: true
@@ -66,7 +67,8 @@ jobs:
6667
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6768
with:
6869
fetch-depth: 1
69-
- uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
70+
- name: "Install go"
71+
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
7072
with:
7173
go-version: ${{ env.GO_VERSION }}
7274
check-latest: true

‎.github/workflows/project.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@ jobs:
2020
with:
2121
path: src/github.com/containerd/nerdctl
2222
fetch-depth: 100
23-
- uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
23+
- name: "Install go"
24+
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
2425
with:
2526
go-version: ${{ env.GO_VERSION }}
27+
check-latest: true
2628
cache-dependency-path: src/github.com/containerd/nerdctl
2729
- uses: containerd/project-checks@d7751f3c375b8fe4a84c02a068184ee4c1f59bc4 # v1.2.2
2830
with:

‎.github/workflows/release.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,11 @@ jobs:
2121
attestations: write # for provenances
2222
steps:
2323
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
24-
- uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
24+
- name: "Install go"
25+
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
2526
with:
26-
go-version: 1.24.x
27+
go-version: "1.24"
28+
check-latest: true
2729
- name: "Compile binaries"
2830
run: make artifacts
2931
- name: "SHA256SUMS"

‎.github/workflows/test-canary.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ jobs:
7070
7171
. ./hack/provisioning/version/fetch.sh
7272
printf "GO_VERSION=%s\n" "$(go::canary::for::go-setup)" >> "$GITHUB_ENV"
73-
- uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
73+
- name: "Install go"
74+
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
7475
with:
7576
go-version: ${{ env.GO_VERSION }}
7677
check-latest: true

‎.github/workflows/test.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
- '**.md'
1111

1212
env:
13-
GO_VERSION: 1.24.x
13+
GO_VERSION: "1.24"
1414
GOTOOLCHAIN: local
1515
SHORT_TIMEOUT: 5
1616
LONG_TIMEOUT: 60
@@ -76,7 +76,8 @@ jobs:
7676
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7777
with:
7878
fetch-depth: 1
79-
- uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
79+
- name: "Install go"
80+
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
8081
with:
8182
go-version: ${{ env.GO_VERSION }}
8283
check-latest: true
@@ -301,17 +302,18 @@ jobs:
301302
strategy:
302303
fail-fast: false
303304
matrix:
304-
go-version: ["1.23.x", "1.24.x"]
305+
go-version: ["1.23", "1.24"]
305306
steps:
306307
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
307308
with:
308309
fetch-depth: 1
309-
- uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
310+
- name: "Install go"
311+
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
310312
with:
311313
go-version: ${{ matrix.go-version }}
312314
check-latest: true
313315
- name: "build"
314-
run: GO_VERSION="$(echo ${{ matrix.go-version }} | sed -e s/.x//)" make binaries
316+
run: make binaries
315317

316318
test-integration-docker-compatibility:
317319
timeout-minutes: 40
@@ -321,7 +323,8 @@ jobs:
321323
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
322324
with:
323325
fetch-depth: 1
324-
- uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
326+
- name: "Install go"
327+
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
325328
with:
326329
go-version: ${{ env.GO_VERSION }}
327330
check-latest: true
@@ -357,7 +360,8 @@ jobs:
357360
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
358361
with:
359362
fetch-depth: 1
360-
- uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
363+
- name: "Install go"
364+
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
361365
with:
362366
go-version: ${{ env.GO_VERSION }}
363367
check-latest: true
@@ -386,7 +390,7 @@ jobs:
386390
- uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
387391
with:
388392
path: /root/.vagrant.d
389-
key: vagrant-${{ matrix.box }}
393+
key: vagrant
390394
- name: Set up vagrant
391395
run: |
392396
# from https://github.com/containerd/containerd/blob/v2.0.2/.github/workflows/ci.yml#L583-L596
@@ -424,8 +428,6 @@ jobs:
424428
runs-on: ubuntu-24.04
425429
env:
426430
MODE: ${{ matrix.mode }}
427-
# FIXME: this is only necessary to access the build cache. To remove with build cleanup.
428-
CONTAINERD_VERSION: v2.0.5
429431
steps:
430432
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
431433
with:
@@ -482,7 +484,7 @@ jobs:
482484
docker buildx create --name with-gha --use
483485
docker buildx build \
484486
--output=type=docker \
485-
--cache-from type=gha,scope=amd64-${CONTAINERD_VERSION} \
487+
--cache-from type=gha,scope=test-integration-dependencies-amd64 \
486488
-t test-integration --target "${TARGET}" \
487489
.
488490

‎.github/workflows/tigron.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
paths: 'mod/tigron/**'
1010

1111
env:
12-
GO_VERSION: 1.24.x
12+
GO_VERSION: "1.24"
1313
GOTOOLCHAIN: local
1414

1515
jobs:

0 commit comments

Comments
 (0)