Skip to content

Commit 0296acd

Browse files
committed
Use makefile task to install golangci
Signed-off-by: apostasie <[email protected]>
1 parent 088fe02 commit 0296acd

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

.github/workflows/test-canary.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
go-version: ${{ env.GO_VERSION }}
7676
check-latest: true
7777
- run: go install ./cmd/nerdctl
78-
- run: go install -v gotest.tools/gotestsum@v1
78+
- run: make install-dev-tools
7979
# This here is solely to get the cni install script, which has not been modified in 3+ years.
8080
# There is little to no reason to update this to latest containerd
8181
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

.github/workflows/test.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -337,8 +337,9 @@ jobs:
337337
docker run --privileged --rm tonistiigi/binfmt --install linux/arm/v7
338338
- name: "Prepare integration test environment"
339339
run: |
340-
sudo apt-get install -y expect
341-
go install -v gotest.tools/gotestsum@v1
340+
# FIXME: remove expect when we are done removing unbuffer from tests
341+
sudo apt-get install -qq expect
342+
make install-dev-tools
342343
- name: "Ensure that the integration test suite is compatible with Docker"
343344
run: WITH_SUDO=true ./hack/test-integration.sh -test.target=docker
344345
- name: "Ensure that the IPv6 integration test suite is compatible with Docker"
@@ -361,8 +362,9 @@ jobs:
361362
with:
362363
go-version: ${{ env.GO_VERSION }}
363364
check-latest: true
364-
- run: go install ./cmd/nerdctl
365-
- run: go install -v gotest.tools/gotestsum@v1
365+
- run: |
366+
go install ./cmd/nerdctl
367+
make install-dev-tools
366368
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
367369
with:
368370
repository: containerd/containerd

0 commit comments

Comments
 (0)