diff --git a/.github/workflows/ci-cache-warmup-platform-jobs.yml b/.github/workflows/ci-cache-warmup-platform-jobs.yml index 38ca56e5750..8a169323b12 100644 --- a/.github/workflows/ci-cache-warmup-platform-jobs.yml +++ b/.github/workflows/ci-cache-warmup-platform-jobs.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - runner: [ubuntu-24.04-arm, blacksmith-4vcpu-ubuntu-2404] + runner: [ubuntu-24.04-arm, blacksmith-8vcpu-ubuntu-2404] runs-on: ${{ matrix.runner }} timeout-minutes: 10 env: diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 9012ae68c31..01f3fde8c72 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -894,7 +894,7 @@ jobs: uses: ./.github/workflows/unit-tests.yml with: node_versions: '["24"]' - runner: blacksmith-4vcpu-ubuntu-2404 + runner: blacksmith-8vcpu-ubuntu-2404 phase_diagnostics: true shards: ${{ needs.preflight.outputs.shards }} run_shards: ${{ needs.code_paths.outputs.mobile_ci_tools != 'true' }} diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index ec75664be85..5db6fda346e 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -175,7 +175,7 @@ jobs: export ORCA_SHARD_SOURCE_SHA node config/scripts/run-vitest.mjs run --config config/vitest.config.ts \ --shard=${{ matrix.shard.index }}/${{ matrix.shard.count }} \ - ${{ (runner.arch == 'ARM64' || inputs.runner == 'blacksmith-4vcpu-ubuntu-2404') && '--maxWorkers=4' || '' }} + ${{ inputs.runner == 'blacksmith-8vcpu-ubuntu-2404' && '--maxWorkers=8' || (runner.arch == 'ARM64' || inputs.runner == 'blacksmith-4vcpu-ubuntu-2404') && '--maxWorkers=4' || '' }} - name: Seal unit module cache id: module-cache-seal diff --git a/config/scripts/ci-dependency-download-cache.test.mjs b/config/scripts/ci-dependency-download-cache.test.mjs index 8db4ab39c40..6564daa6447 100644 --- a/config/scripts/ci-dependency-download-cache.test.mjs +++ b/config/scripts/ci-dependency-download-cache.test.mjs @@ -375,7 +375,7 @@ describe('CI dependency download caches', () => { expect(warm['runs-on']).toBe('${{ matrix.runner }}') expect(warm.strategy.matrix.runner).toEqual(['ubuntu-24.04-arm', pr.jobs.test.with.runner]) expect(pr.jobs.preflight['runs-on']).toBe('blacksmith-8vcpu-ubuntu-2404') - expect(pr.jobs.test.with.runner).toBe('blacksmith-4vcpu-ubuntu-2404') + expect(pr.jobs.test.with.runner).toBe('blacksmith-8vcpu-ubuntu-2404') expect(units['runs-on']).toBe('${{ inputs.runner }}') expect(JSON.parse(pr.jobs.test.with.node_versions)).toEqual(['24']) expect(warmInstall.if).toBeUndefined() diff --git a/config/scripts/ci-unit-module-cache.test.mjs b/config/scripts/ci-unit-module-cache.test.mjs index c054d4be878..d2cbb470e6d 100644 --- a/config/scripts/ci-unit-module-cache.test.mjs +++ b/config/scripts/ci-unit-module-cache.test.mjs @@ -162,6 +162,12 @@ it('retains four workers on ARM and the four-core Blacksmith unit runner', () => '--maxWorkers=4' ) } + expect( + runInNewContext(expression, { + runner: { arch: 'X64' }, + inputs: { runner: 'blacksmith-8vcpu-ubuntu-2404' } + }) + ).toBe('--maxWorkers=8') expect( runInNewContext(expression, { runner: { arch: 'X64' }, inputs: { runner: 'ubuntu-latest' } }) ).toBe('')