From 8c86f811199279bd572a91bcc56a5692c8ce007a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Grabarz?= Date: Thu, 19 Dec 2024 20:02:11 +0100 Subject: [PATCH] try using output-base option from bazel-contrib/setup-bazel --- .github/workflows/changelog.yml | 11 +- .github/workflows/engine-benchmark.yml | 11 +- .github/workflows/engine-checks-nightly.yml | 165 +++++------------- .github/workflows/engine-checks-optional.yml | 33 +--- .github/workflows/engine-checks.yml | 77 +++----- .github/workflows/extra-nightly-tests.yml | 22 +-- .github/workflows/gui-checks.yml | 2 +- .github/workflows/gui-packaging-optional.yml | 33 +--- .github/workflows/gui-packaging.yml | 66 ++----- .github/workflows/promote.yml | 11 +- .github/workflows/release.yml | 143 +++++---------- .github/workflows/std-libs-benchmark.yml | 11 +- .github/workflows/wasm-checks.yml | 33 +--- build_tools/build/src/ci_gen.rs | 12 +- .../src/actions/workflow/definition.rs | 36 ++-- 15 files changed, 184 insertions(+), 482 deletions(-) diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 677bd7efe8cf..51d96df226ad 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -16,18 +16,13 @@ jobs: runs-on: - X64 steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 diff --git a/.github/workflows/engine-benchmark.yml b/.github/workflows/engine-benchmark.yml index f2182eb2717e..847c1747413a 100644 --- a/.github/workflows/engine-benchmark.yml +++ b/.github/workflows/engine-benchmark.yml @@ -18,18 +18,13 @@ jobs: runs-on: - benchmark steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 diff --git a/.github/workflows/engine-checks-nightly.yml b/.github/workflows/engine-checks-nightly.yml index ba156eb64bdb..e8c04bc63904 100644 --- a/.github/workflows/engine-checks-nightly.yml +++ b/.github/workflows/engine-checks-nightly.yml @@ -19,18 +19,13 @@ jobs: - self-hosted - Linux steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -77,18 +72,13 @@ jobs: - macOS - ARM64 steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -133,18 +123,13 @@ jobs: runs-on: - macos-13 steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -190,18 +175,13 @@ jobs: - self-hosted - Windows steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -247,18 +227,13 @@ jobs: - self-hosted - Linux steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -304,18 +279,13 @@ jobs: - self-hosted - Linux steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -373,18 +343,13 @@ jobs: - macOS - ARM64 steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -440,18 +405,13 @@ jobs: runs-on: - macos-13 steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -508,18 +468,13 @@ jobs: - self-hosted - Windows steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -576,18 +531,13 @@ jobs: - self-hosted - Linux steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -644,18 +594,13 @@ jobs: - self-hosted - Linux steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -716,18 +661,13 @@ jobs: - macOS - ARM64 steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -786,18 +726,13 @@ jobs: runs-on: - macos-13 steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -857,18 +792,13 @@ jobs: - self-hosted - Windows steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -928,18 +858,13 @@ jobs: - self-hosted - Linux steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 diff --git a/.github/workflows/engine-checks-optional.yml b/.github/workflows/engine-checks-optional.yml index b5d5c9dca9ad..b1417793cbbc 100644 --- a/.github/workflows/engine-checks-optional.yml +++ b/.github/workflows/engine-checks-optional.yml @@ -21,18 +21,13 @@ jobs: - macos-13 continue-on-error: true steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -78,18 +73,13 @@ jobs: - macos-13 continue-on-error: true steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -146,18 +136,13 @@ jobs: - macos-13 continue-on-error: true steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 diff --git a/.github/workflows/engine-checks.yml b/.github/workflows/engine-checks.yml index 04c0afdf5782..2233a8ce297c 100644 --- a/.github/workflows/engine-checks.yml +++ b/.github/workflows/engine-checks.yml @@ -21,18 +21,13 @@ jobs: - self-hosted - Linux steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -78,18 +73,13 @@ jobs: - self-hosted - Windows steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -135,18 +125,13 @@ jobs: - self-hosted - Linux steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -203,18 +188,13 @@ jobs: - self-hosted - Windows steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -271,18 +251,13 @@ jobs: - self-hosted - Linux steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -342,18 +317,13 @@ jobs: - self-hosted - Windows steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -413,18 +383,13 @@ jobs: - self-hosted - Linux steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 diff --git a/.github/workflows/extra-nightly-tests.yml b/.github/workflows/extra-nightly-tests.yml index c7e1e4859213..48f37e724052 100644 --- a/.github/workflows/extra-nightly-tests.yml +++ b/.github/workflows/extra-nightly-tests.yml @@ -18,18 +18,13 @@ jobs: runs-on: - ubuntu-latest steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -97,18 +92,13 @@ jobs: runs-on: - ubuntu-latest steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 diff --git a/.github/workflows/gui-checks.yml b/.github/workflows/gui-checks.yml index 1c5cf893c005..1214e95b6c75 100644 --- a/.github/workflows/gui-checks.yml +++ b/.github/workflows/gui-checks.yml @@ -143,7 +143,7 @@ jobs: - name: 📺 Install Playwright Browsers working-directory: app/gui run: pnpm run playwright:install - + - name: ⚙️ Compile id: compile run: pnpm run compile diff --git a/.github/workflows/gui-packaging-optional.yml b/.github/workflows/gui-packaging-optional.yml index 00f8a7524b51..cf99ba093e52 100644 --- a/.github/workflows/gui-packaging-optional.yml +++ b/.github/workflows/gui-packaging-optional.yml @@ -21,18 +21,13 @@ jobs: - macos-13 continue-on-error: true steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -76,18 +71,13 @@ jobs: - macos-13 continue-on-error: true steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -145,18 +135,13 @@ jobs: - macos-13 continue-on-error: true steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 diff --git a/.github/workflows/gui-packaging.yml b/.github/workflows/gui-packaging.yml index 486e525cc249..e156f113b160 100644 --- a/.github/workflows/gui-packaging.yml +++ b/.github/workflows/gui-packaging.yml @@ -21,18 +21,13 @@ jobs: - self-hosted - Linux steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -76,18 +71,13 @@ jobs: - self-hosted - Windows steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -131,18 +121,13 @@ jobs: - self-hosted - Linux steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -198,18 +183,13 @@ jobs: - self-hosted - Windows steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -267,18 +247,13 @@ jobs: - self-hosted - Linux steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -353,18 +328,13 @@ jobs: - self-hosted - Windows steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 diff --git a/.github/workflows/promote.yml b/.github/workflows/promote.yml index 33561f95e4cb..58b106ef25cb 100644 --- a/.github/workflows/promote.yml +++ b/.github/workflows/promote.yml @@ -40,18 +40,13 @@ jobs: - self-hosted - Linux steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index df26d3bae674..1e18aaa642e1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,18 +36,13 @@ jobs: - self-hosted - Linux steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -82,18 +77,13 @@ jobs: - self-hosted - Linux steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -147,18 +137,13 @@ jobs: - self-hosted - Linux steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -212,18 +197,13 @@ jobs: - self-hosted - Linux steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -269,18 +249,13 @@ jobs: - self-hosted - Linux steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -330,18 +305,13 @@ jobs: - macOS - ARM64 steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -389,18 +359,13 @@ jobs: runs-on: - macos-13 steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -449,18 +414,13 @@ jobs: - self-hosted - Windows steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -514,18 +474,13 @@ jobs: - self-hosted - Linux steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -578,18 +533,13 @@ jobs: - self-hosted - Linux steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -652,18 +602,13 @@ jobs: - macOS - ARM64 steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -731,18 +676,13 @@ jobs: runs-on: - macos-13 steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -811,18 +751,13 @@ jobs: - self-hosted - Windows steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 diff --git a/.github/workflows/std-libs-benchmark.yml b/.github/workflows/std-libs-benchmark.yml index ce3109407b7a..4c888fd0b8af 100644 --- a/.github/workflows/std-libs-benchmark.yml +++ b/.github/workflows/std-libs-benchmark.yml @@ -18,18 +18,13 @@ jobs: runs-on: - benchmark steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 diff --git a/.github/workflows/wasm-checks.yml b/.github/workflows/wasm-checks.yml index bfdf3851a251..75826fe36f94 100644 --- a/.github/workflows/wasm-checks.yml +++ b/.github/workflows/wasm-checks.yml @@ -21,18 +21,13 @@ jobs: - self-hosted - Linux steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -76,18 +71,13 @@ jobs: - self-hosted - Linux steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 @@ -131,18 +121,13 @@ jobs: - self-hosted - Linux steps: - - if: runner.os != 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 + - name: Setup bazel environment + uses: bazel-contrib/setup-bazel@09f3a72 with: bazelisk-cache: true disk-cache: true + output-base: ${{ runner.os == 'Windows' && 'c:/_bazel' || '' }} repository-cache: true - - if: runner.os == 'Windows' - name: Setup bazel environment - uses: bazel-contrib/setup-bazel@0.9.0 - with: - bazelrc: startup --output_base=c:/_bazel - if: startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent') name: Installing wasm-pack uses: jetli/wasm-pack-action@v0.4.0 diff --git a/build_tools/build/src/ci_gen.rs b/build_tools/build/src/ci_gen.rs index 44ff2891181e..672ed2f43e6c 100644 --- a/build_tools/build/src/ci_gen.rs +++ b/build_tools/build/src/ci_gen.rs @@ -17,8 +17,7 @@ use ide_ci::actions::workflow::definition::is_non_windows_runner; use ide_ci::actions::workflow::definition::is_windows_runner; use ide_ci::actions::workflow::definition::run; use ide_ci::actions::workflow::definition::setup_artifact_api; -use ide_ci::actions::workflow::definition::setup_bazel_non_windows; -use ide_ci::actions::workflow::definition::setup_bazel_windows; +use ide_ci::actions::workflow::definition::setup_bazel; use ide_ci::actions::workflow::definition::setup_wasm_pack_step; use ide_ci::actions::workflow::definition::shell; use ide_ci::actions::workflow::definition::wrap_expression; @@ -376,13 +375,8 @@ pub fn runs_on(os: OS, runner_type: RunnerType) -> Vec { /// Initial CI job steps: check out the source code and set up the environment. pub fn setup_script_steps() -> Vec { - let mut ret = vec![ - setup_bazel_non_windows(), - setup_bazel_windows(), - setup_wasm_pack_step(), - setup_artifact_api(), - checkout_repo_step(), - ]; + let mut ret = + vec![setup_bazel(), setup_wasm_pack_step(), setup_artifact_api(), checkout_repo_step()]; // We run `./run --help` so: // * The build-script is build in a separate step. This allows us to monitor its build-time and // not affect timing of the actual build. diff --git a/build_tools/ci_utils/src/actions/workflow/definition.rs b/build_tools/ci_utils/src/actions/workflow/definition.rs index 275bbc3509ec..47ecb2ed7cfb 100644 --- a/build_tools/ci_utils/src/actions/workflow/definition.rs +++ b/build_tools/ci_utils/src/actions/workflow/definition.rs @@ -1,5 +1,7 @@ //! Model of a workflow definition and related utilities. +use serde_yaml::Value; + use crate::prelude::*; use crate::convert_case::ToKebabCase; @@ -76,33 +78,19 @@ pub fn is_github_hosted() -> String { "startsWith(runner.name, 'GitHub Actions') || startsWith(runner.name, 'Hosted Agent')".into() } -pub fn setup_bazel_non_windows() -> Step { - Step { - name: Some("Setup bazel environment".into()), - uses: Some("bazel-contrib/setup-bazel@0.9.0".into()), - with: Some(step::Argument::Other(BTreeMap::from([ - ("bazelisk-cache".to_string(), serde_yaml::Value::Bool(true)), - ("disk-cache".to_string(), serde_yaml::Value::Bool(true)), - ("repository-cache".to_string(), serde_yaml::Value::Bool(true)), - ]))), - r#if: Some(is_non_windows_runner()), - ..default() - } -} - -pub fn setup_bazel_windows() -> Step { +pub fn setup_bazel() -> Step { Step { name: Some("Setup bazel environment".into()), - uses: Some("bazel-contrib/setup-bazel@0.9.0".into()), + uses: Some("bazel-contrib/setup-bazel@09f3a72".into()), with: Some(step::Argument::Other(BTreeMap::from([ ( - "bazelrc".to_string(), - serde_yaml::Value::String("startup --output_base=c:/_bazel".into()), + "output-base".to_string(), + Value::String(format!("${{{{ {} && 'c:/_bazel' || '' }}}}", is_windows_runner())), ), - // TODO: We want to have the caches enabled, but for now it won't work with manually - // set output base on windows. + ("bazelisk-cache".to_string(), Value::Bool(true)), + ("disk-cache".to_string(), Value::Bool(true)), + ("repository-cache".to_string(), Value::Bool(true)), ]))), - r#if: Some(is_windows_runner()), ..default() } } @@ -970,7 +958,7 @@ impl Step { pub fn with_custom_argument( mut self, name: impl Into, - value: impl Into, + value: impl Into, ) -> Self { match &mut self.with { Some(step::Argument::Other(map)) => { @@ -1042,11 +1030,11 @@ pub mod step { GitHubScript { script: String, }, - Other(BTreeMap), + Other(BTreeMap), } impl Argument { - pub fn new_other(name: impl Into, value: impl Into) -> Self { + pub fn new_other(name: impl Into, value: impl Into) -> Self { Argument::Other(BTreeMap::from_iter([(name.into(), value.into())])) } }