Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): bump @docker/actions-toolkit from 0.45.0 to 0.46.0 #132

Merged
merged 4 commits into from
Nov 25, 2024
+23 −55
Merged

build(deps): bump @docker/actions-toolkit from 0.45.0 to 0.46.0 #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a0bafae
build(deps): bump @docker/actions-toolkit from 0.45.0 to 0.46.0
dependabot[bot] Nov 25, 2024
939fbc5
chore: update generated content
crazy-max Nov 25, 2024
f0ff59f
ci: remove qemu set up workaround
crazy-max Nov 25, 2024
482b1d7
ci: bump docker version
crazy-max Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 9 additions & 41 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:
pull_request:

env:
DOCKER_VERSION: v24.0.9
DOCKER_VERSION: v27.3.1

jobs:
main:
Expand All @@ -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 }}
Expand All @@ -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:
Expand All @@ -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,
Expand All @@ -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: ./
Expand All @@ -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

Expand Down Expand Up @@ -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: ./
Expand Down Expand Up @@ -281,6 +247,7 @@ jobs:
name: Set up Docker
uses: ./
with:
version: ${{ env.DOCKER_VERSION }}
set-host: true
-
name: List contexts
Expand All @@ -297,6 +264,7 @@ jobs:
name: Set up Docker
uses: ./
with:
version: ${{ env.DOCKER_VERSION }}
rootless: true
-
name: List contexts
Expand Down
4 changes: 2 additions & 2 deletions dist/index.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/index.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"packageManager": "yarn@3.6.3",
"dependencies": {
"@actions/core": "^1.11.1",
"@docker/actions-toolkit": "^0.45.0"
"@docker/actions-toolkit": "^0.46.0"
},
"devDependencies": {
"@types/node": "^20.6.0",
Expand Down
20 changes: 10 additions & 10 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
Loading