From 090a7a90c376233fec3492e672ccd47dce91bf33 Mon Sep 17 00:00:00 2001 From: Jelle Raaijmakers Date: Tue, 27 May 2025 10:24:52 +0200 Subject: [PATCH] CI: Switch over remaining runners to Blacksmith.sh Everything that's not self-hosted or macOS is now pointing to Blacksmith.sh. Nightly jobs and JS artifact builds use 8VCPU machines, while regular integration builds & tests use 16VCPU machines. --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/js-artifacts.yml | 4 ++-- .github/workflows/nightly-lagom.yml | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b429f13d967..f8818d217c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,33 +15,33 @@ jobs: fail-fast: false matrix: os_name: ['Linux'] - runner: [ubuntu-24.04] arch: ['x86_64'] build_preset: ['Sanitizer_CI'] toolchain: ['GNU'] clang_plugins: [false] + runner: ['blacksmith-16vcpu-ubuntu-2404'] include: - os_name: 'Linux' - runner: ubuntu-24.04 arch: 'x86_64' build_preset: 'Sanitizer_CI' toolchain: 'Clang' clang_plugins: true + runner: 'blacksmith-16vcpu-ubuntu-2404' - os_name: 'macOS' - runner: macos-15 arch: 'arm64' build_preset: 'Sanitizer_CI' toolchain: 'Clang' clang_plugins: false + runner: 'macos-15' - os_name: 'Linux' - runner: ubuntu-24.04 arch: 'x86_64' build_preset: 'Fuzzers_CI' toolchain: 'Clang' clang_plugins: false + runner: 'blacksmith-16vcpu-ubuntu-2404' uses: ./.github/workflows/lagom-template.yml with: diff --git a/.github/workflows/js-artifacts.yml b/.github/workflows/js-artifacts.yml index 7739dd2c61e..fcede731500 100644 --- a/.github/workflows/js-artifacts.yml +++ b/.github/workflows/js-artifacts.yml @@ -17,15 +17,15 @@ jobs: fail-fast: false matrix: os_name: ['Linux'] - runner: ['ubuntu-24.04'] arch: ['x86_64'] package_type: ['Linux-x86_64'] + runner: ['blacksmith-8vcpu-ubuntu-2404'] include: - os_name: 'macOS' - runner: 'macos-15' arch: 'arm64' package_type: 'macOS-universal2' + runner: 'macos-15' steps: - name: Checkout LadybirdBrowser/ladybird diff --git a/.github/workflows/nightly-lagom.yml b/.github/workflows/nightly-lagom.yml index aa278cd395f..dbc628bad77 100644 --- a/.github/workflows/nightly-lagom.yml +++ b/.github/workflows/nightly-lagom.yml @@ -18,47 +18,47 @@ jobs: fail-fast: false matrix: os_name: ['Linux'] - runner: [ubuntu-24.04-arm] arch: ['arm64'] build_preset: ['Sanitizer_CI'] toolchain: ['Clang'] clang_plugins: [false] + runner: ['blacksmith-8vcpu-ubuntu-2404-arm'] include: - os_name: 'Linux' - runner: ubuntu-24.04 arch: 'x86_64' build_preset: 'Distribution_CI' toolchain: 'GNU' clang_plugins: false + runner: 'blacksmith-8vcpu-ubuntu-2404' - os_name: 'macOS' - runner: macos-15 arch: 'arm64' build_preset: 'Distribution_CI' toolchain: 'Clang' clang_plugins: false + runner: 'macos-15' - os_name: 'Linux' - runner: ubuntu-24.04-arm arch: 'arm64' build_preset: 'Distribution_CI' toolchain: 'Clang' clang_plugins: false + runner: 'blacksmith-8vcpu-ubuntu-2404-arm' - os_name: 'Linux' - runner: ubuntu-24.04 arch: 'x86_64' build_preset: 'Sanitizer_CI' toolchain: 'Swift' clang_plugins: false + runner: 'blacksmith-8vcpu-ubuntu-2404' - os_name: 'macOS' - runner: macos-15 arch: 'arm64' build_preset: 'Sanitizer_CI' toolchain: 'Swift' clang_plugins: false + runner: 'macos-15' uses: ./.github/workflows/lagom-template.yml with: