From cc17e76a52b72483556658bdad622ccd9cf65f08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2024 22:27:55 +0000 Subject: [PATCH 1/6] build(deps): bump codecov/codecov-action from 4 to 5 Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4 to 5. - [Release notes](https://github.com/codecov/codecov-action/releases) - [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/codecov/codecov-action/compare/v4...v5) --- updated-dependencies: - dependency-name: codecov/codecov-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a99d5601..2a732145 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -43,7 +43,7 @@ jobs: shell: bash - name: Upload coverage - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 if: env.RUN_CODECOV == 'true' with: file: ./coverage/clover.xml @@ -163,7 +163,7 @@ jobs: shell: bash - name: Upload coverage - uses: codecov/codecov-action@v4 + uses: codecov/codecov-action@v5 if: env.RUN_CODECOV == 'true' with: file: ./coverage/clover.xml From 91444bd3bdf1960221ec4f3c0ee746303706a738 Mon Sep 17 00:00:00 2001 From: crazy-max <1951866+crazy-max@users.noreply.github.com> Date: Fri, 15 Nov 2024 00:29:29 +0000 Subject: [PATCH 2/6] github: update .github/docker-releases.json Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .github/docker-releases.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/docker-releases.json b/.github/docker-releases.json index 64d0d084..426aafa8 100644 --- a/.github/docker-releases.json +++ b/.github/docker-releases.json @@ -5,6 +5,12 @@ "html_url": "https://github.com/moby/moby/releases/tag/v27.3.1", "assets": [] }, + "v27.4.0-rc.1": { + "id": 185528936, + "tag_name": "v27.4.0-rc.1", + "html_url": "https://github.com/moby/moby/releases/tag/v27.4.0-rc.1", + "assets": [] + }, "v23.0.15": { "id": 178729348, "tag_name": "v23.0.15", From 1362d8044750696bcdc710e18824b0a152f49380 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Mon, 18 Nov 2024 15:19:43 +0100 Subject: [PATCH 3/6] docker(install): check qemu is installed Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- src/docker/install.ts | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/src/docker/install.ts b/src/docker/install.ts index 22828cfb..984fcf1b 100644 --- a/src/docker/install.ts +++ b/src/docker/install.ts @@ -279,9 +279,14 @@ export class Install { core.info(limaCfg); }); - const qemuArch = await Install.qemuArch(); + if (!(await Install.qemuInstalled())) { + await core.group('Installing QEMU', async () => { + await Exec.exec('brew', ['install', 'qemu'], {env: envs}); + }); + } + const qemuBin = await Install.qemuBin(); await core.group('QEMU version', async () => { - await Exec.exec(`qemu-system-${qemuArch} --version`); + await Exec.exec(qemuBin, ['--version']); }); // lima might already be started on the runner so env var added in download @@ -617,29 +622,42 @@ EOF`, return await io .which('lima', true) .then(res => { - core.debug(`docker.Install.limaAvailable ok: ${res}`); + core.debug(`docker.Install.limaInstalled ok: ${res}`); return true; }) .catch(error => { - core.debug(`docker.Install.limaAvailable error: ${error}`); + core.debug(`docker.Install.limaInstalled error: ${error}`); return false; }); } - private static async qemuArch(): Promise { + private static async qemuBin(): Promise { switch (os.arch()) { case 'x64': { - return 'x86_64'; + return `qemu-system-x86_64`; } case 'arm64': { - return 'aarch64'; + return `qemu-system-aarch64`; } default: { - return os.arch(); + return `qemu-system-${os.arch()}`; } } } + private static async qemuInstalled(): Promise { + return await io + .which(await Install.qemuBin(), true) + .then(res => { + core.debug(`docker.Install.qemuInstalled ok: ${res}`); + return true; + }) + .catch(error => { + core.debug(`docker.Install.qemuInstalled error: ${error}`); + return false; + }); + } + public static async getRelease(version: string): Promise { const url = `https://raw.githubusercontent.com/docker/actions-toolkit/main/.github/docker-releases.json`; const http: httpm.HttpClient = new httpm.HttpClient('docker-actions-toolkit'); From 8dfe7ecbd9734f6ccf4cef49badab77958c37ea4 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Mon, 18 Nov 2024 15:51:00 +0100 Subject: [PATCH 4/6] ci: remove deprecated macos-12 runner Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- .github/workflows/test.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a99d5601..4bb2f2c7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -98,7 +98,6 @@ jobs: - ubuntu-latest #- macos-14 # no virt: https://github.com/docker/actions-toolkit/issues/317 - macos-13 - - macos-12 - windows-latest steps: - From 9f6ff3da7f0f4f586928422a54dda654e28b7a1f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Nov 2024 15:16:48 +0000 Subject: [PATCH 5/6] build(deps): bump cross-spawn from 7.0.3 to 7.0.6 Bumps [cross-spawn](https://github.com/moxystudio/node-cross-spawn) from 7.0.3 to 7.0.6. - [Changelog](https://github.com/moxystudio/node-cross-spawn/blob/master/CHANGELOG.md) - [Commits](https://github.com/moxystudio/node-cross-spawn/compare/v7.0.3...v7.0.6) --- updated-dependencies: - dependency-name: cross-spawn dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 83d207d3..87e30bce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3403,13 +3403,13 @@ __metadata: linkType: hard "cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3": - version: 7.0.3 - resolution: "cross-spawn@npm:7.0.3" + version: 7.0.6 + resolution: "cross-spawn@npm:7.0.6" dependencies: path-key: ^3.1.0 shebang-command: ^2.0.0 which: ^2.0.1 - checksum: 671cc7c7288c3a8406f3c69a3ae2fc85555c04169e9d611def9a675635472614f1c0ed0ef80955d5b6d4e724f6ced67f0ad1bb006c2ea643488fcfef994d7f52 + checksum: 8d306efacaf6f3f60e0224c287664093fa9185680b2d195852ba9a863f85d02dcc737094c6e512175f8ee0161f9b87c73c6826034c2422e39de7d6569cf4503b languageName: node linkType: hard From 749fc87fb22793023091011632894cb33b4294e5 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Mon, 18 Nov 2024 16:16:59 +0100 Subject: [PATCH 6/6] ci: fix deprecated input for codecov-action Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2a732145..44d1b478 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -46,7 +46,7 @@ jobs: uses: codecov/codecov-action@v5 if: env.RUN_CODECOV == 'true' with: - file: ./coverage/clover.xml + files: ./coverage/clover.xml flags: unit token: ${{ secrets.CODECOV_TOKEN }} @@ -166,6 +166,6 @@ jobs: uses: codecov/codecov-action@v5 if: env.RUN_CODECOV == 'true' with: - file: ./coverage/clover.xml + files: ./coverage/clover.xml flags: itg token: ${{ secrets.CODECOV_TOKEN }}