Skip to content

Commit 568f1c6

Browse files
committed
chore: switch to docker/setup-docker-action and update test matrix
1 parent 605e6f6 commit 568f1c6

File tree

2 files changed

+19
-15
lines changed

2 files changed

+19
-15
lines changed

.github/workflows/release.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ env:
3434
IMAGE_BASE_REPO: k3d-io
3535
IMAGE_PLATFORMS: linux/amd64,linux/arm64,linux/arm/v7
3636
GO_VERSION: "1.22.x"
37-
DOCKER_VERSION: "27.0"
37+
DOCKER_VERSION: "v27.4.0"
3838

3939
jobs:
4040
test-suite:
@@ -49,9 +49,9 @@ jobs:
4949
with:
5050
go-version: "${{ env.GO_VERSION }}"
5151
- name: Setup Docker
52-
uses: docker-practice/actions-setup-docker@master
52+
uses: docker/setup-docker-action@v4
5353
with:
54-
docker_version: "${{ env.DOCKER_VERSION }}"
54+
version: "${{ env.DOCKER_VERSION }}"
5555
- name: Setup CI Tools
5656
run: make ci-setup
5757
# Code Check
@@ -86,9 +86,9 @@ jobs:
8686
- uses: actions/checkout@v4
8787
# Container Image Setup
8888
- name: Setup Docker
89-
uses: docker-practice/actions-setup-docker@master
89+
uses: docker/setup-docker-action@v4
9090
with:
91-
docker_version: "${{ env.DOCKER_VERSION }}"
91+
version: "${{ env.DOCKER_VERSION }}"
9292
- name: Log in to the Container registry
9393
uses: docker/login-action@v3
9494
with:

.github/workflows/test-matrix.yaml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ jobs:
1515
# steps:
1616
# - uses: actions/checkout@v4
1717
# - name: Setup Docker
18-
# uses: docker-practice/actions-setup-docker@master
18+
# uses: docker/setup-docker-action@v4
19+
# with:
20+
# version: "${{ env.DOCKER_VERSION }}"
1921
# - name: Test Docker Version expected to fail
2022
# run: |
2123
# echo "Running test with docker version ${{matrix.docker_version}}"
@@ -36,14 +38,14 @@ jobs:
3638
fail-fast: false
3739
matrix:
3840
docker_version:
39-
- "23.0.15"
40-
- "25.0.6"
41-
- "26.1.5"
42-
- "27.3.1"
41+
- "v23.0.15"
42+
- "v25.0.6"
43+
- "v26.1.5"
44+
- "v27.4.0"
4345
steps:
4446
- uses: actions/checkout@v4
4547
- name: Setup Docker
46-
uses: docker-practice/actions-setup-docker@master
48+
uses: docker/setup-docker-action@v4
4749
- name: Test Docker Version expected to pass
4850
run: |
4951
echo "Running test with docker version ${{matrix.docker_version}}"
@@ -64,7 +66,9 @@ jobs:
6466
# steps:
6567
# - uses: actions/checkout@v4
6668
# - name: Setup Docker
67-
# uses: docker-practice/actions-setup-docker@master
69+
# uses: docker/setup-docker-action@v4
70+
# with:
71+
# version: "${{ env.DOCKER_VERSION }}"
6872
# - name: Test K3s Version expected to fail
6973
# run: |
7074
# echo "Running test with docker version ${{matrix.k3s_channel}}"
@@ -85,14 +89,14 @@ jobs:
8589
fail-fast: false
8690
matrix:
8791
k3s_channel:
88-
- "v1.28"
89-
- "v1.29"
9092
- "v1.30"
9193
- "v1.31"
94+
- "v1.32"
95+
- "v1.33"
9296
steps:
9397
- uses: actions/checkout@v4
9498
- name: Setup Docker
95-
uses: docker-practice/actions-setup-docker@master
99+
uses: docker/setup-docker-action@v4
96100
- name: Test K3s Version expected to pass
97101
run: |
98102
echo "Running test with K3s version ${{matrix.k3s_channel}}"

0 commit comments

Comments
 (0)