diff --git a/.github/workflows/linux-release-build.yml b/.github/workflows/linux-release-build.yml index 008b59ae3..565c1dd70 100644 --- a/.github/workflows/linux-release-build.yml +++ b/.github/workflows/linux-release-build.yml @@ -32,7 +32,7 @@ jobs: matrix: arch: [x86_64, aarch64] env: - SCCACHE_GHA_ENABLED: ${ inputs.use-sccache } + SCCACHE_GHA_ENABLED: ${ inputs.use-sccache && 'true' || 'false' } CARGO_TERM_COLOR: always RUSTC_WRAPPER: ${ inputs.use-sccache && 'sccache' || '' } CARGO_INCREMENTAL: 0 diff --git a/.github/workflows/macos-release-build.yml b/.github/workflows/macos-release-build.yml index 1aef80095..22190d786 100644 --- a/.github/workflows/macos-release-build.yml +++ b/.github/workflows/macos-release-build.yml @@ -31,7 +31,7 @@ jobs: matrix: arch: [x86_64, aarch64] env: - SCCACHE_GHA_ENABLED: ${ inputs.use-sccache } + SCCACHE_GHA_ENABLED: ${ inputs.use-sccache && 'true' || 'false' } CARGO_TERM_COLOR: always RUSTC_WRAPPER: ${ inputs.use-sccache && 'sccache' || '' } CARGO_INCREMENTAL: 0 diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml index 0a6f39bb9..9e3b7e478 100644 --- a/.github/workflows/windows-release-build.yml +++ b/.github/workflows/windows-release-build.yml @@ -34,7 +34,7 @@ jobs: # aarch64 does not need full 16x, and we also dont use full LTO when generating GPO runs-on: ${{ (inputs.release-branch == 'release' && !inputs.generate-gpo && matrix.arch == 'x86_64') && 'self-hosted' || 'ubuntu-latest' }} env: - SCCACHE_GHA_ENABLED: ${ inputs.use-sccache } + SCCACHE_GHA_ENABLED: ${ inputs.use-sccache && 'true' || 'false' } CARGO_TERM_COLOR: always RUSTC_WRAPPER: ${ inputs.use-sccache && 'sccache' || '' } CARGO_INCREMENTAL: 0 @@ -156,7 +156,7 @@ jobs: aria2 echo Setup wine aria2c "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/gecko.cache.level-1.toolchains.v3.linux64-wine.latest/artifacts/public%2Fbuild%2Fwine.tar.zst" -o wine.tar.zst - tar --zstd -xvf wine.tar.zst -C ~/win-cross + tar --zstd -xf wine.tar.zst -C ~/win-cross rm wine.tar.zst echo Setup Visual Studio ./mach python --virtualenv build taskcluster/scripts/misc/get_vs.py build/vs/vs2022.yaml ~/win-cross/vs2022 diff --git a/configs/common/mozconfig b/configs/common/mozconfig index 7c8ed9076..364464cd7 100644 --- a/configs/common/mozconfig +++ b/configs/common/mozconfig @@ -23,10 +23,13 @@ export MOZ_INCLUDE_SOURCE_INFO=1 ac_add_options --enable-application=browser -if test -x "$(command -v sccache)"; then - ac_add_options --with-ccache=sccache -elif test -f "$HOME/.mozbuild/sccache/sccache"; then - ac_add_options --with-ccache="$HOME"/.mozbuild/sccache/sccache +# Anything except 'SCCACHE_GHA_ENABLED == false' +if ! test "$SCCACHE_GHA_ENABLED" = "false"; then + if test -x "$(command -v sccache)"; then + ac_add_options --with-ccache=sccache + elif test -f "$HOME/.mozbuild/sccache/sccache"; then + ac_add_options --with-ccache="$HOME"/.mozbuild/sccache/sccache + fi fi if test "$ZEN_RELEASE"; then