Compare commits

..

No commits in common. "master" and "v4.3.0" have entirely different histories.

7 changed files with 104 additions and 114 deletions

View File

@ -35,12 +35,12 @@ jobs:
node-version: ${{ env.NODE_VERSION }} node-version: ${{ env.NODE_VERSION }}
- -
name: Initialize CodeQL name: Initialize CodeQL
uses: github/codeql-action/init@b96794f015dfd88f77b49b1c93e0fa7110f94c63 # v4.38.0 uses: github/codeql-action/init@54f647b7e1bb85c95cddabcd46b0c578ec92bc1a # v4.36.3
with: with:
languages: javascript-typescript languages: javascript-typescript
build-mode: none build-mode: none
- -
name: Perform CodeQL Analysis name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@b96794f015dfd88f77b49b1c93e0fa7110f94c63 # v4.38.0 uses: github/codeql-action/analyze@54f647b7e1bb85c95cddabcd46b0c578ec92bc1a # v4.36.3
with: with:
category: "/language:javascript-typescript" category: "/language:javascript-typescript"

136
dist/index.cjs generated vendored

File diff suppressed because one or more lines are too long

6
dist/index.cjs.map generated vendored

File diff suppressed because one or more lines are too long

2
dist/licenses.txt generated vendored
View File

@ -216,7 +216,7 @@ Apache License
The following npm package may be included in this product: The following npm package may be included in this product:
- @docker/actions-toolkit@0.100.0 - @docker/actions-toolkit@0.96.0
This package contains the following license: This package contains the following license:

View File

@ -24,7 +24,7 @@
"packageManager": "yarn@4.15.0", "packageManager": "yarn@4.15.0",
"dependencies": { "dependencies": {
"@actions/core": "^3.0.1", "@actions/core": "^3.0.1",
"@docker/actions-toolkit": "^0.100.0" "@docker/actions-toolkit": "^0.96.0"
}, },
"devDependencies": { "devDependencies": {
"@eslint/js": "^9.39.3", "@eslint/js": "^9.39.3",

View File

@ -28,8 +28,8 @@ actionsToolkit.run(
await Docker.getExecOutput(['image', 'inspect', input.image], { await Docker.getExecOutput(['image', 'inspect', input.image], {
ignoreReturnCode: true ignoreReturnCode: true
}).then(res => { }).then(res => {
if (res.exitCode != 0) { if (res.stderr.length > 0 && res.exitCode != 0) {
throw new Error(`Failed to inspect image ${input.image}: ${Docker.getErrorMessage(res.stderr)}`); throw new Error(res.stderr.match(/(.*)\s*$/)?.[0]?.trim() ?? 'unknown error');
} }
}); });
}); });
@ -38,8 +38,8 @@ actionsToolkit.run(
await Docker.getExecOutput(['run', '--rm', '--privileged', input.image, '--version'], { await Docker.getExecOutput(['run', '--rm', '--privileged', input.image, '--version'], {
ignoreReturnCode: true ignoreReturnCode: true
}).then(res => { }).then(res => {
if (res.exitCode != 0) { if (res.stderr.length > 0 && res.exitCode != 0) {
throw new Error(`Failed to get binfmt version: ${Docker.getErrorMessage(res.stderr)}`); throw new Error(res.stderr.match(/(.*)\s*$/)?.[0]?.trim() ?? 'unknown error');
} }
}); });
}); });
@ -49,8 +49,8 @@ actionsToolkit.run(
await Docker.getExecOutput(['run', '--rm', '--privileged', input.image, '--uninstall', 'qemu-*'], { await Docker.getExecOutput(['run', '--rm', '--privileged', input.image, '--uninstall', 'qemu-*'], {
ignoreReturnCode: true ignoreReturnCode: true
}).then(res => { }).then(res => {
if (res.exitCode != 0) { if (res.stderr.length > 0 && res.exitCode != 0) {
throw new Error(`Failed to uninstall current emulators: ${Docker.getErrorMessage(res.stderr)}`); throw new Error(res.stderr.match(/(.*)\s*$/)?.[0]?.trim() ?? 'unknown error');
} }
}); });
}); });
@ -60,8 +60,8 @@ actionsToolkit.run(
await Docker.getExecOutput(['run', '--rm', '--privileged', input.image, '--install', input.platforms], { await Docker.getExecOutput(['run', '--rm', '--privileged', input.image, '--install', input.platforms], {
ignoreReturnCode: true ignoreReturnCode: true
}).then(res => { }).then(res => {
if (res.exitCode != 0) { if (res.stderr.length > 0 && res.exitCode != 0) {
throw new Error(`Failed to install QEMU static binaries: ${Docker.getErrorMessage(res.stderr)}`); throw new Error(res.stderr.match(/(.*)\s*$/)?.[0]?.trim() ?? 'unknown error');
} }
}); });
}); });
@ -71,8 +71,8 @@ actionsToolkit.run(
ignoreReturnCode: true, ignoreReturnCode: true,
silent: true silent: true
}).then(res => { }).then(res => {
if (res.exitCode != 0) { if (res.stderr.length > 0 && res.exitCode != 0) {
throw new Error(`Failed to extract available platforms: ${Docker.getErrorMessage(res.stderr)}`); throw new Error(res.stderr.match(/(.*)\s*$/)?.[0]?.trim() ?? 'unknown error');
} }
const platforms: Platforms = JSON.parse(res.stdout.trim()); const platforms: Platforms = JSON.parse(res.stdout.trim());
core.info(`${platforms.supported.join(',')}`); core.info(`${platforms.supported.join(',')}`);

View File

@ -437,9 +437,9 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@docker/actions-toolkit@npm:^0.100.0": "@docker/actions-toolkit@npm:^0.96.0":
version: 0.100.0 version: 0.96.0
resolution: "@docker/actions-toolkit@npm:0.100.0" resolution: "@docker/actions-toolkit@npm:0.96.0"
dependencies: dependencies:
"@actions/artifact": "npm:^6.2.1" "@actions/artifact": "npm:^6.2.1"
"@actions/cache": "npm:^6.2.0" "@actions/cache": "npm:^6.2.0"
@ -462,7 +462,7 @@ __metadata:
semver: "npm:^7.8.5" semver: "npm:^7.8.5"
tar-stream: "npm:^3.2.1" tar-stream: "npm:^3.2.1"
tmp: "npm:^0.2.7" tmp: "npm:^0.2.7"
checksum: 10/74eaa1afb1887ed2974e403870205889844d42eb527550309819fd24b80484b92ebf95ba4ee01eef607b66acd655a8457fc25a6d27ff2f81e842705ff98b1976 checksum: 10/7116f99ccf54bc47864113ff8911e857a0832e7603e3c2cf62e3ed067b4ce0c8b1987acd05766f57b15b182455987a3f49862b97fe5e413f35a8bc4d71500ae3
languageName: node languageName: node
linkType: hard linkType: hard
@ -934,30 +934,20 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@humanfs/core@npm:^0.19.2": "@humanfs/core@npm:^0.19.1":
version: 0.19.2 version: 0.19.1
resolution: "@humanfs/core@npm:0.19.2" resolution: "@humanfs/core@npm:0.19.1"
dependencies: checksum: 10/270d936be483ab5921702623bc74ce394bf12abbf57d9145a69e8a0d1c87eb1c768bd2d93af16c5705041e257e6d9cc7529311f63a1349f3678abc776fc28523
"@humanfs/types": "npm:^0.15.0"
checksum: 10/c6c0273721ec8df3d36a57c390a11a168d0a2f513d78bceb25165bded4fcb73609b1a317edc6c8f331cefd4b47285dde0b1e6679e08ef7f062232ec14fe05312
languageName: node languageName: node
linkType: hard linkType: hard
"@humanfs/node@npm:^0.16.6": "@humanfs/node@npm:^0.16.6":
version: 0.16.8 version: 0.16.7
resolution: "@humanfs/node@npm:0.16.8" resolution: "@humanfs/node@npm:0.16.7"
dependencies: dependencies:
"@humanfs/core": "npm:^0.19.2" "@humanfs/core": "npm:^0.19.1"
"@humanfs/types": "npm:^0.15.0"
"@humanwhocodes/retry": "npm:^0.4.0" "@humanwhocodes/retry": "npm:^0.4.0"
checksum: 10/ed01b3c066d9cec7526d139b9e71ca00ee4a30b3b5f5f5c198eb069c3509a3e167e180ba7e1e5a83b9571e906c4908bd20402b47586887452311af7354995e95 checksum: 10/b3633d3dce898592cac515ba5e6693c78e6be92863541d3eaf2c009b10f52b2fa62ff6e6e06f240f2447ddbe7b5f1890bc34e9308470675c876eee207553a08d
languageName: node
linkType: hard
"@humanfs/types@npm:^0.15.0":
version: 0.15.0
resolution: "@humanfs/types@npm:0.15.0"
checksum: 10/dea3cc7fd8f8d4d088ed8d0a9921cf12bd8e1cdf40a6133106b03a6e2aebcc9a6f1771b3643b7ec71baae90d08245db34069dfcc861da8d678662741e6c3c986
languageName: node languageName: node
linkType: hard linkType: hard
@ -2837,7 +2827,7 @@ __metadata:
resolution: "docker-setup-qemu@workspace:." resolution: "docker-setup-qemu@workspace:."
dependencies: dependencies:
"@actions/core": "npm:^3.0.1" "@actions/core": "npm:^3.0.1"
"@docker/actions-toolkit": "npm:^0.100.0" "@docker/actions-toolkit": "npm:^0.96.0"
"@eslint/js": "npm:^9.39.3" "@eslint/js": "npm:^9.39.3"
"@types/node": "npm:^24.11.0" "@types/node": "npm:^24.11.0"
"@typescript-eslint/eslint-plugin": "npm:^8.56.1" "@typescript-eslint/eslint-plugin": "npm:^8.56.1"
@ -4006,13 +3996,13 @@ __metadata:
linkType: hard linkType: hard
"js-yaml@npm:^4.1.0, js-yaml@npm:^4.1.1": "js-yaml@npm:^4.1.0, js-yaml@npm:^4.1.1":
version: 4.3.2 version: 4.3.1
resolution: "js-yaml@npm:4.3.2" resolution: "js-yaml@npm:4.3.1"
dependencies: dependencies:
argparse: "npm:^2.0.1" argparse: "npm:^2.0.1"
bin: bin:
js-yaml: bin/js-yaml.js js-yaml: bin/js-yaml.js
checksum: 10/05c44b9c73e4901d92703b155e76518df64bf01ac62e4c036b47de4b391e19b72e32656e8954d51b436307f08cc9d0c0d4ec617d061cf2f65fffee9f3114bee7 checksum: 10/2ce71b5d632abbd77da80447bf860e8a0264e54bffe94840984887d58b023761495b523727547904517a6107a1ef189854b361e0fc44995ee13a84f222d7bd42
languageName: node languageName: node
linkType: hard linkType: hard
@ -4989,12 +4979,12 @@ __metadata:
linkType: hard linkType: hard
"postcss-selector-parser@npm:^7.0.0": "postcss-selector-parser@npm:^7.0.0":
version: 7.1.5 version: 7.1.1
resolution: "postcss-selector-parser@npm:7.1.5" resolution: "postcss-selector-parser@npm:7.1.1"
dependencies: dependencies:
cssesc: "npm:^3.0.0" cssesc: "npm:^3.0.0"
util-deprecate: "npm:^1.0.2" util-deprecate: "npm:^1.0.2"
checksum: 10/ae66bbcb5d370a3f4b4660e23a208352a885c651f1b420f7b998faaa1034832b870066f49e295f73ee3da6a6c6312c56fea1b2039969f8d803438fa48232b307 checksum: 10/bb3c6455b20af26a556e3021e21101d8470252644e673c1612f7348ff8dd41b11321329f0694cf299b5b94863f823480b72d3e2f4bd3a89dc43e2d8c0dbad341
languageName: node languageName: node
linkType: hard linkType: hard