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
docker · Nov 25, 2024 · 560d8b1 · 560d8b1
2 parents a37e5b7 + 482b1d7
commit 560d8b1
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 55 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ on:
   pull_request:
 
 env:
-  DOCKER_VERSION: v24.0.9
+  DOCKER_VERSION: v27.3.1
 
 jobs:
   main:
@@ -31,30 +31,17 @@ jobs:
           - macos-13
           - windows-latest
         version:
-          - pinned
-          - latest
+          - v27.3.1
           - type=image,tag=27.3.1
     steps:
       -
         name: Checkout
         uses: actions/checkout@v4
-      -
-        # https://github.com/crazy-max/ghaction-setup-docker/issues/108
-        name: Set up QEMU
-        if: startsWith(matrix.os, 'macos')
-        uses: docker/actions-toolkit/.github/actions/macos-setup-qemu@19ca9ade20f5da695f76a10988d6532058575f82
-      -
-        name: Set version
-        shell: bash
-        run: |
-          if [ "${{ matrix.version }}" != "pinned" ]; then
-            echo "DOCKER_VERSION=${{ matrix.version }}" >> $GITHUB_ENV
-          fi
       -
         name: Set up Docker
         uses: ./
         with:
-          version: ${{ env.DOCKER_VERSION }}
+          version: ${{ matrix.version }}
 
   channel:
     runs-on: ${{ matrix.os }}
@@ -70,16 +57,11 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v4
-      -
-        # https://github.com/crazy-max/ghaction-setup-docker/issues/108
-        name: Set up QEMU
-        if: startsWith(matrix.os, 'macos')
-        uses: docker/actions-toolkit/.github/actions/macos-setup-qemu@19ca9ade20f5da695f76a10988d6532058575f82
       -
         name: Set up Docker
         uses: ./
         with:
-          version: v24.0.0-rc.4
+          version: ${{ env.DOCKER_VERSION }}
           channel: test
 
   daemon-config:
@@ -96,15 +78,11 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v4
-      -
-        # https://github.com/crazy-max/ghaction-setup-docker/issues/108
-        name: Set up QEMU
-        if: startsWith(matrix.os, 'macos')
-        uses: docker/actions-toolkit/.github/actions/macos-setup-qemu@19ca9ade20f5da695f76a10988d6532058575f82
       -
         name: Set up Docker
         uses: ./
         with:
+          version: ${{ env.DOCKER_VERSION }}
           daemon-config: |
             {
               "debug": true,
@@ -127,11 +105,6 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v4
-      -
-        # https://github.com/crazy-max/ghaction-setup-docker/issues/108
-        name: Set up QEMU
-        if: startsWith(matrix.os, 'macos')
-        uses: docker/actions-toolkit/.github/actions/macos-setup-qemu@19ca9ade20f5da695f76a10988d6532058575f82
       -
         name: Set up Docker
         uses: ./
@@ -150,13 +123,11 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v4
-      -
-        # https://github.com/crazy-max/ghaction-setup-docker/issues/108
-        name: Set up QEMU
-        uses: docker/actions-toolkit/.github/actions/macos-setup-qemu@19ca9ade20f5da695f76a10988d6532058575f82
       -
         name: Set up Docker
         uses: ./
+        with:
+          version: ${{ env.DOCKER_VERSION }}
         env:
           LIMA_START_ARGS: --cpus 4 --memory 8
 
@@ -217,11 +188,6 @@ jobs:
       -
         name: Checkout
         uses: actions/checkout@v4
-      -
-        # https://github.com/crazy-max/ghaction-setup-docker/issues/108
-        name: Set up QEMU
-        if: startsWith(matrix.os, 'macos')
-        uses: docker/actions-toolkit/.github/actions/macos-setup-qemu@19ca9ade20f5da695f76a10988d6532058575f82
       -
         name: Set up Docker
         uses: ./
@@ -281,6 +247,7 @@ jobs:
         name: Set up Docker
         uses: ./
         with:
+          version: ${{ env.DOCKER_VERSION }}
           set-host: true
       -
         name: List contexts
@@ -297,6 +264,7 @@ jobs:
         name: Set up Docker
         uses: ./
         with:
+          version: ${{ env.DOCKER_VERSION }}
           rootless: true
       -
         name: List contexts

diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
   "packageManager": "[email protected]",
   "dependencies": {
     "@actions/core": "^1.11.1",
-    "@docker/actions-toolkit": "^0.45.0"
+    "@docker/actions-toolkit": "^0.46.0"
   },
   "devDependencies": {
     "@types/node": "^20.6.0",

diff --git a/yarn.lock b/yarn.lock
@@ -1102,9 +1102,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@docker/actions-toolkit@npm:^0.45.0":
-  version: 0.45.0
-  resolution: "@docker/actions-toolkit@npm:0.45.0"
+"@docker/actions-toolkit@npm:^0.46.0":
+  version: 0.46.0
+  resolution: "@docker/actions-toolkit@npm:0.46.0"
   dependencies:
     "@actions/artifact": ^2.1.11
     "@actions/cache": ^3.3.0
@@ -1118,7 +1118,7 @@ __metadata:
     "@octokit/core": ^5.1.0
     "@octokit/plugin-rest-endpoint-methods": ^10.4.0
     async-retry: ^1.3.3
-    csv-parse: ^5.5.6
+    csv-parse: ^5.6.0
     gunzip-maybe: ^1.4.2
     handlebars: ^4.7.8
     he: ^1.2.0
@@ -1127,7 +1127,7 @@ __metadata:
     semver: ^7.6.3
     tar-stream: ^3.1.7
     tmp: ^0.2.3
-  checksum: 64037efd5227a5c131c7b92887d2014f163d3552cd08ce77c5a11d31115b6a8a67b4f22433b3f17356868f88c6b666503dd96970847ac8827f99182f3a394788
+  checksum: cd34682d1b801c17c81f7f6791c4c81a69018f02413a1f7a7c2c1086bf0ee98c9afb5b44e6d5b8827df188819913eec47fa5b54b63f522b4a87c216de0b5725f
   languageName: node
   linkType: hard
 
@@ -3229,10 +3229,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"csv-parse@npm:^5.5.6":
-  version: 5.5.6
-  resolution: "csv-parse@npm:5.5.6"
-  checksum: ee06f97f674487dc1d001b360de8ea510a41b9d971abf43bcf9c3be22c83a3634df0d3ebfbe52fd49d145077066be7ff9f25de3fc6b71aefb973099b04147a25
+"csv-parse@npm:^5.6.0":
+  version: 5.6.0
+  resolution: "csv-parse@npm:5.6.0"
+  checksum: 173e176bdaf212bab37d0f6d39a06d039d24a1c0ee40b9f1023ebf8b36095934807deeb493c0fb58592b39b0682ccd0be5c9e8d2b137c08807e7031595ea7a51
   languageName: node
   linkType: hard
 
@@ -3359,7 +3359,7 @@ __metadata:
   resolution: "docker-setup-docker@workspace:."
   dependencies:
     "@actions/core": ^1.11.1
-    "@docker/actions-toolkit": ^0.45.0
+    "@docker/actions-toolkit": ^0.46.0
     "@types/node": ^20.6.0
     "@typescript-eslint/eslint-plugin": ^6.6.0
     "@typescript-eslint/parser": ^6.6.0