File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 9292 --arg pkcs11 ${{ inputs.pkcs11-store-test }} \
9393 ${{ inputs.extra-nix-flags }} \
9494 --run '
95- SCCACHE_LOG=debug SCCACHE_NO_DAEMON=1 make -C "$TAR_DIR" run-ci -j4 V=1 TEST_CI_ARGS="-p actions --measure-flakiness 9 --skip-tests=$CI_SKIP_TESTS"
95+ make -C "$TAR_DIR" run-ci -j4 V=1 TEST_CI_ARGS="-p actions --measure-flakiness 9 --skip-tests=$CI_SKIP_TESTS"
9696 ' "$TAR_DIR/shell.nix"
Original file line number Diff line number Diff line change @@ -156,10 +156,10 @@ jobs:
156156 # built separately in build-aarch64-linux-v8
157157 # - runner: ubuntu-24.04-arm
158158 # system: aarch64-linux
159- # - runner: macos-15-intel
160- # system: x86_64-darwin
161- # - runner: macos-latest
162- # system: aarch64-darwin
159+ - runner : macos-15-intel
160+ system : x86_64-darwin
161+ - runner : macos-latest
162+ system : aarch64-darwin
163163 name : ' ${{ matrix.system }}: with shared libraries${{ matrix.perfetto && '' and perfetto'' || '''' }}'
164164 uses : $/.github/workflows/build-shared.yml
165165 with :
@@ -173,7 +173,6 @@ jobs:
173173 CACHIX_AUTH_TOKEN : ${{ secrets.CACHIX_AUTH_TOKEN }}
174174
175175 build-aarch64-linux-v8 :
176- if : false
177176 needs : build-tarball
178177 runs-on : ubuntu-24.04-arm
179178 name : ' aarch64-linux: Cache V8 build'
Original file line number Diff line number Diff line change @@ -121,7 +121,6 @@ pkgs.mkShell {
121121 '' ;
122122
123123 env = {
124- RUST_BACKTRACE = "full" ;
125124 BUILD_WITH = if ( ninja != null ) then "ninja" else "make" ;
126125 NINJA = pkgs . lib . optionalString ( ninja != null ) "${ pkgs . lib . getExe ninja } " ;
127126 CONFIG_FLAGS = builtins . toString (
Original file line number Diff line number Diff line change 1010# Unstable channel no longer supports Intel architecture for macOS. We can use the 26.05 channel
1111# to keep testing on that platform for a little longer.
1212# TODO: remove this when 26.05 is EOL (end of 2026)
13- if builtins . currentSystem == "x86_64-darwin" then ( import ./pkgs-26.05.nix arg ) else nixpkgs
13+ if builtins . currentSystem == "x86_64-darwin" then
14+ ( import ./pkgs-26.05.nix arg )
15+ else
16+ nixpkgs
17+ //
18+ nixpkgs . lib . optionalAttrs ( pkgs . stdenv . hostPlatform . isLinux && pkgs . stdenv . hostPlatform . isx86_64 )
19+ {
20+ sccache = nixpkgs . callPackage ( builtins . fetchurl {
21+ url = "${ repo } /raw/aff8a0b28396750446e5537a96461bc4facdb287/pkgs/by-name/sc/sccache/package.nix" ;
22+ sha256 = "09dlc99sam9ld9jvzgcc00r4v4ls1cmbb0yim3mr895fpbs8b3qa" ;
23+ } ) { } ;
24+ }
You can’t perform that action at this time.
0 commit comments