Skip to content

Commit 1d39ee1

Browse files
joyeecheungaduh95
andauthored
fixup! build: skip sscache action on non-main branches
Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 3698f29 commit 1d39ee1

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/build-tarball.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ jobs:
102102
needs: build-tarball
103103
runs-on: ubuntu-24.04
104104
env:
105-
CC: ${{ (github.base_ref == 'main' || github.ref_name == 'main') && 'sccache clang-19' || 'clang-19' }}
106-
CXX: ${{ (github.base_ref == 'main' || github.ref_name == 'main') && 'sccache clang++-19' || 'clang++-19' }}
105+
CC: ${{ (github.base_ref == 'main' || github.ref_name == 'main') && 'sccache' || '' }} clang-19
106+
CXX: ${{ (github.base_ref == 'main' || github.ref_name == 'main') && 'sccache' || '' }} clang++-19
107107
SCCACHE_GHA_ENABLED: ${{ github.base_ref == 'main' || github.ref_name == 'main' }}
108108
SCCACHE_IDLE_TIMEOUT: '0'
109109
steps:

.github/workflows/test-shared.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,9 @@ jobs:
196196
nix-shell \
197197
-I nixpkgs=./tools/nix/pkgs.nix \
198198
--pure --keep TAR_DIR --keep FLAKY_TESTS \
199-
${{ (github.base_ref == 'main' || github.ref_name == 'main') && '--keep SCCACHE_GHA_VERSION --keep ACTIONS_CACHE_SERVICE_V2 --keep ACTIONS_RESULTS_URL --keep ACTIONS_RUNTIME_TOKEN' || '' }} \
199+
--keep SCCACHE_GHA_VERSION --keep ACTIONS_CACHE_SERVICE_V2 --keep ACTIONS_RESULTS_URL --keep ACTIONS_RUNTIME_TOKEN \
200200
--arg loadJSBuiltinsDynamically false \
201-
${{ (github.base_ref == 'main' || github.ref_name == 'main') && '--arg ccache ''(import <nixpkgs> {}).sccache''' || '' }} \
201+
--arg ccache '${{ (github.base_ref == 'main' || github.ref_name == 'main') && 'import <nixpkgs> {}).sccache' || 'null' }}' \
202202
--arg devTools '[]' \
203203
--arg benchmarkTools '[]' \
204204
${{ endsWith(matrix.system, '-darwin') && '--arg withAmaro false --arg withLief false --arg withSQLite false --arg extraConfigFlags ''["--without-inspector" "--without-node-options"]'' \' || '\' }}

0 commit comments

Comments
 (0)