Skip to content

Commit 560d8b1

Browse files
crazy-maxcrazy-max
authored
Merge pull request #132 from crazy-max/dependabot/npm_and_yarn/docker/actions-toolkit-0.46.0
build(deps): bump @docker/actions-toolkit from 0.45.0 to 0.46.0
2 parents a37e5b7 + 482b1d7 commit 560d8b1

File tree

5 files changed

+23
-55
lines changed

5 files changed

+23
-55
lines changed

‎.github/workflows/ci.yml

+9-41
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
pull_request:
1818

1919
env:
20-
DOCKER_VERSION: v24.0.9
20+
DOCKER_VERSION: v27.3.1
2121

2222
jobs:
2323
main:
@@ -31,30 +31,17 @@ jobs:
3131
- macos-13
3232
- windows-latest
3333
version:
34-
- pinned
35-
- latest
34+
- v27.3.1
3635
- type=image,tag=27.3.1
3736
steps:
3837
-
3938
name: Checkout
4039
uses: actions/checkout@v4
41-
-
42-
# https://github.com/crazy-max/ghaction-setup-docker/issues/108
43-
name: Set up QEMU
44-
if: startsWith(matrix.os, 'macos')
45-
uses: docker/actions-toolkit/.github/actions/macos-setup-qemu@19ca9ade20f5da695f76a10988d6532058575f82
46-
-
47-
name: Set version
48-
shell: bash
49-
run: |
50-
if [ "${{ matrix.version }}" != "pinned" ]; then
51-
echo "DOCKER_VERSION=${{ matrix.version }}" >> $GITHUB_ENV
52-
fi
5340
-
5441
name: Set up Docker
5542
uses: ./
5643
with:
57-
version: ${{ env.DOCKER_VERSION }}
44+
version: ${{ matrix.version }}
5845

5946
channel:
6047
runs-on: ${{ matrix.os }}
@@ -70,16 +57,11 @@ jobs:
7057
-
7158
name: Checkout
7259
uses: actions/checkout@v4
73-
-
74-
# https://github.com/crazy-max/ghaction-setup-docker/issues/108
75-
name: Set up QEMU
76-
if: startsWith(matrix.os, 'macos')
77-
uses: docker/actions-toolkit/.github/actions/macos-setup-qemu@19ca9ade20f5da695f76a10988d6532058575f82
7860
-
7961
name: Set up Docker
8062
uses: ./
8163
with:
82-
version: v24.0.0-rc.4
64+
version: ${{ env.DOCKER_VERSION }}
8365
channel: test
8466

8567
daemon-config:
@@ -96,15 +78,11 @@ jobs:
9678
-
9779
name: Checkout
9880
uses: actions/checkout@v4
99-
-
100-
# https://github.com/crazy-max/ghaction-setup-docker/issues/108
101-
name: Set up QEMU
102-
if: startsWith(matrix.os, 'macos')
103-
uses: docker/actions-toolkit/.github/actions/macos-setup-qemu@19ca9ade20f5da695f76a10988d6532058575f82
10481
-
10582
name: Set up Docker
10683
uses: ./
10784
with:
85+
version: ${{ env.DOCKER_VERSION }}
10886
daemon-config: |
10987
{
11088
"debug": true,
@@ -127,11 +105,6 @@ jobs:
127105
-
128106
name: Checkout
129107
uses: actions/checkout@v4
130-
-
131-
# https://github.com/crazy-max/ghaction-setup-docker/issues/108
132-
name: Set up QEMU
133-
if: startsWith(matrix.os, 'macos')
134-
uses: docker/actions-toolkit/.github/actions/macos-setup-qemu@19ca9ade20f5da695f76a10988d6532058575f82
135108
-
136109
name: Set up Docker
137110
uses: ./
@@ -150,13 +123,11 @@ jobs:
150123
-
151124
name: Checkout
152125
uses: actions/checkout@v4
153-
-
154-
# https://github.com/crazy-max/ghaction-setup-docker/issues/108
155-
name: Set up QEMU
156-
uses: docker/actions-toolkit/.github/actions/macos-setup-qemu@19ca9ade20f5da695f76a10988d6532058575f82
157126
-
158127
name: Set up Docker
159128
uses: ./
129+
with:
130+
version: ${{ env.DOCKER_VERSION }}
160131
env:
161132
LIMA_START_ARGS: --cpus 4 --memory 8
162133

@@ -217,11 +188,6 @@ jobs:
217188
-
218189
name: Checkout
219190
uses: actions/checkout@v4
220-
-
221-
# https://github.com/crazy-max/ghaction-setup-docker/issues/108
222-
name: Set up QEMU
223-
if: startsWith(matrix.os, 'macos')
224-
uses: docker/actions-toolkit/.github/actions/macos-setup-qemu@19ca9ade20f5da695f76a10988d6532058575f82
225191
-
226192
name: Set up Docker
227193
uses: ./
@@ -281,6 +247,7 @@ jobs:
281247
name: Set up Docker
282248
uses: ./
283249
with:
250+
version: ${{ env.DOCKER_VERSION }}
284251
set-host: true
285252
-
286253
name: List contexts
@@ -297,6 +264,7 @@ jobs:
297264
name: Set up Docker
298265
uses: ./
299266
with:
267+
version: ${{ env.DOCKER_VERSION }}
300268
rootless: true
301269
-
302270
name: List contexts

‎dist/index.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/index.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"packageManager": "[email protected]",
2828
"dependencies": {
2929
"@actions/core": "^1.11.1",
30-
"@docker/actions-toolkit": "^0.45.0"
30+
"@docker/actions-toolkit": "^0.46.0"
3131
},
3232
"devDependencies": {
3333
"@types/node": "^20.6.0",

‎yarn.lock

+10-10
Original file line numberDiff line numberDiff line change
@@ -1102,9 +1102,9 @@ __metadata:
11021102
languageName: node
11031103
linkType: hard
11041104

1105-
"@docker/actions-toolkit@npm:^0.45.0":
1106-
version: 0.45.0
1107-
resolution: "@docker/actions-toolkit@npm:0.45.0"
1105+
"@docker/actions-toolkit@npm:^0.46.0":
1106+
version: 0.46.0
1107+
resolution: "@docker/actions-toolkit@npm:0.46.0"
11081108
dependencies:
11091109
"@actions/artifact": ^2.1.11
11101110
"@actions/cache": ^3.3.0
@@ -1118,7 +1118,7 @@ __metadata:
11181118
"@octokit/core": ^5.1.0
11191119
"@octokit/plugin-rest-endpoint-methods": ^10.4.0
11201120
async-retry: ^1.3.3
1121-
csv-parse: ^5.5.6
1121+
csv-parse: ^5.6.0
11221122
gunzip-maybe: ^1.4.2
11231123
handlebars: ^4.7.8
11241124
he: ^1.2.0
@@ -1127,7 +1127,7 @@ __metadata:
11271127
semver: ^7.6.3
11281128
tar-stream: ^3.1.7
11291129
tmp: ^0.2.3
1130-
checksum: 64037efd5227a5c131c7b92887d2014f163d3552cd08ce77c5a11d31115b6a8a67b4f22433b3f17356868f88c6b666503dd96970847ac8827f99182f3a394788
1130+
checksum: cd34682d1b801c17c81f7f6791c4c81a69018f02413a1f7a7c2c1086bf0ee98c9afb5b44e6d5b8827df188819913eec47fa5b54b63f522b4a87c216de0b5725f
11311131
languageName: node
11321132
linkType: hard
11331133

@@ -3229,10 +3229,10 @@ __metadata:
32293229
languageName: node
32303230
linkType: hard
32313231

3232-
"csv-parse@npm:^5.5.6":
3233-
version: 5.5.6
3234-
resolution: "csv-parse@npm:5.5.6"
3235-
checksum: ee06f97f674487dc1d001b360de8ea510a41b9d971abf43bcf9c3be22c83a3634df0d3ebfbe52fd49d145077066be7ff9f25de3fc6b71aefb973099b04147a25
3232+
"csv-parse@npm:^5.6.0":
3233+
version: 5.6.0
3234+
resolution: "csv-parse@npm:5.6.0"
3235+
checksum: 173e176bdaf212bab37d0f6d39a06d039d24a1c0ee40b9f1023ebf8b36095934807deeb493c0fb58592b39b0682ccd0be5c9e8d2b137c08807e7031595ea7a51
32363236
languageName: node
32373237
linkType: hard
32383238

@@ -3359,7 +3359,7 @@ __metadata:
33593359
resolution: "docker-setup-docker@workspace:."
33603360
dependencies:
33613361
"@actions/core": ^1.11.1
3362-
"@docker/actions-toolkit": ^0.45.0
3362+
"@docker/actions-toolkit": ^0.46.0
33633363
"@types/node": ^20.6.0
33643364
"@typescript-eslint/eslint-plugin": ^6.6.0
33653365
"@typescript-eslint/parser": ^6.6.0

0 commit comments

Comments
 (0)