From b6bd191531010fff311ce4c92fcaeddd36c5fccd Mon Sep 17 00:00:00 2001 From: sideshowbarker Date: Fri, 19 Jun 2026 12:11:57 +0900 Subject: [PATCH] CI: Use the image-provided wasm-tools on the Linux jobs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bump the workflow image pin to the 2026.06.14 tag that bakes in wasm-tools. And keep the wasm-tools download/caching steps for the macOS and Windows jobs — but skip those steps on Linux. So, the Linux jobs use the wasm-tools copy the image installs. Follow-up to https://github.com/LadybirdBrowser/ladybird/pull/9972 --- .github/actions/setup/action.yml | 8 ++++---- .github/workflows/ci.yml | 2 +- .github/workflows/js-and-wasm-artifacts.yml | 2 +- .github/workflows/js-and-wasm-benchmarks.yml | 2 +- .github/workflows/libjs-test262.yml | 2 +- .github/workflows/lint-code.yml | 2 +- .github/workflows/nightly-lagom.yml | 2 +- .github/workflows/web-benchmarks.yml | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index a221565479..128a93f6be 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -116,7 +116,7 @@ runs: - name: 'Resolve wasm-tools release' id: 'wasm-tools' - if: ${{ inputs.type == 'build' }} + if: ${{ inputs.type == 'build' && inputs.os != 'Linux' }} shell: bash run: | VERSION=1.243.0 @@ -139,14 +139,14 @@ runs: - name: 'Cache wasm-tools' id: 'wasm-tools-cache' - if: ${{ inputs.type == 'build' }} + if: ${{ inputs.type == 'build' && inputs.os != 'Linux' }} uses: actions/cache@v4 with: path: ${{ github.workspace }}/${{ steps.wasm-tools.outputs.name }} key: ${{ steps.wasm-tools.outputs.name }} - name: 'Install wasm-tools' - if: ${{ inputs.type == 'build' && steps.wasm-tools-cache.outputs.cache-hit != 'true' }} + if: ${{ inputs.type == 'build' && inputs.os != 'Linux' && steps.wasm-tools-cache.outputs.cache-hit != 'true' }} shell: bash run: | FILENAME="${{ steps.wasm-tools.outputs.filename }}" @@ -172,7 +172,7 @@ runs: rm "${FILENAME}" - name: 'Add wasm-tools to PATH' - if: ${{ inputs.type == 'build' }} + if: ${{ inputs.type == 'build' && inputs.os != 'Linux' }} shell: bash run: echo "${GITHUB_WORKSPACE}/${{ steps.wasm-tools.outputs.name }}" >> "$GITHUB_PATH" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9c49767331..177f8e20bb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: toolchain: ['GNU'] clang_plugins: [false] runner_labels: ['["blacksmith-16vcpu-ubuntu-2404"]'] - container: [&ci_container '{"image":"ghcr.io/ladybirdbrowser/ladybird-ci:2026.06.02"}'] + container: [&ci_container '{"image":"ghcr.io/ladybirdbrowser/ladybird-ci:2026.06.14"}'] include: - os_name: 'Linux' diff --git a/.github/workflows/js-and-wasm-artifacts.yml b/.github/workflows/js-and-wasm-artifacts.yml index 7ba791fdf9..1ab9c05793 100644 --- a/.github/workflows/js-and-wasm-artifacts.yml +++ b/.github/workflows/js-and-wasm-artifacts.yml @@ -30,7 +30,7 @@ jobs: toolchain: ['Clang'] package_type: ['Linux-x86_64'] runner_labels: ['["blacksmith-8vcpu-ubuntu-2404"]'] - container: [&ci_container '{"image":"ghcr.io/ladybirdbrowser/ladybird-ci:2026.06.02"}'] + container: [&ci_container '{"image":"ghcr.io/ladybirdbrowser/ladybird-ci:2026.06.14"}'] include: - os_name: 'macOS' diff --git a/.github/workflows/js-and-wasm-benchmarks.yml b/.github/workflows/js-and-wasm-benchmarks.yml index 705ecabacc..10deac135c 100644 --- a/.github/workflows/js-and-wasm-benchmarks.yml +++ b/.github/workflows/js-and-wasm-benchmarks.yml @@ -20,7 +20,7 @@ jobs: arch: ['x86_64'] package_type: ['Linux-x86_64'] runner_labels: ['["ubuntu-24.04-internal", "js-benchmarks", "self-hosted"]'] - container: [&ci_container '{"image":"ghcr.io/ladybirdbrowser/ladybird-ci:2026.06.02"}'] + container: [&ci_container '{"image":"ghcr.io/ladybirdbrowser/ladybird-ci:2026.06.14"}'] include: - os_name: 'macOS' diff --git a/.github/workflows/libjs-test262.yml b/.github/workflows/libjs-test262.yml index fbcbbc1a57..e5799272bc 100644 --- a/.github/workflows/libjs-test262.yml +++ b/.github/workflows/libjs-test262.yml @@ -19,7 +19,7 @@ jobs: runs-on: 'blacksmith-16vcpu-ubuntu-2404' if: github.repository == 'LadybirdBrowser/ladybird' container: - image: ghcr.io/ladybirdbrowser/ladybird-ci:2026.06.02 + image: ghcr.io/ladybirdbrowser/ladybird-ci:2026.06.14 steps: - name: Checkout LadybirdBrowser/ladybird diff --git a/.github/workflows/lint-code.yml b/.github/workflows/lint-code.yml index 16dd6c9d27..d2f8237f93 100644 --- a/.github/workflows/lint-code.yml +++ b/.github/workflows/lint-code.yml @@ -10,7 +10,7 @@ jobs: runs-on: blacksmith-2vcpu-ubuntu-2404 if: github.repository == 'LadybirdBrowser/ladybird' container: - image: ghcr.io/ladybirdbrowser/ladybird-ci:2026.06.02 + image: ghcr.io/ladybirdbrowser/ladybird-ci:2026.06.14 steps: - uses: actions/checkout@v6.0.3 diff --git a/.github/workflows/nightly-lagom.yml b/.github/workflows/nightly-lagom.yml index ec1b845637..e1711640b7 100644 --- a/.github/workflows/nightly-lagom.yml +++ b/.github/workflows/nightly-lagom.yml @@ -24,7 +24,7 @@ jobs: toolchain: ['Clang'] clang_plugins: [false] runner_labels: ['["blacksmith-8vcpu-ubuntu-2404-arm"]'] - container: [&ci_container '{"image":"ghcr.io/ladybirdbrowser/ladybird-ci:2026.06.02"}'] + container: [&ci_container '{"image":"ghcr.io/ladybirdbrowser/ladybird-ci:2026.06.14"}'] include: - os_name: 'Linux' diff --git a/.github/workflows/web-benchmarks.yml b/.github/workflows/web-benchmarks.yml index 4287a7788f..20c060daaf 100644 --- a/.github/workflows/web-benchmarks.yml +++ b/.github/workflows/web-benchmarks.yml @@ -22,7 +22,7 @@ jobs: os_name: ['Linux'] arch: ['x86_64'] runner_labels: ['["ubuntu-24.04-internal", "web-benchmarks", "self-hosted"]'] - container: [&ci_container '{"image":"ghcr.io/ladybirdbrowser/ladybird-ci:2026.06.02"}'] + container: [&ci_container '{"image":"ghcr.io/ladybirdbrowser/ladybird-ci:2026.06.14"}'] include: - os_name: 'macOS'