Preserve canonical core settings in cloud GHC traces

This commit is contained in:
Moritz Angermann committed 2026-10-16 20:20:25 +09:00
1 parent a62b1848c0
commit 3fd3a03879
2 files changed
+6 -3

No files matched your search

+1 -1
View File
@@ -107,7 +107,7 @@ jobs:
original="(builtins.getFlake \"$flake_ref\").hydraJobs.x86_64-linux.\"lib:simplex-chat\""
timeout --kill-after=30s 7200s nice -n 10 nix build \
--file scripts/nix/trace-native-ghc.nix --arg original "$original" \
--no-link -L --keep-failed --max-jobs 1 --cores 1 --timeout 7200 \
--no-link -L --keep-failed --max-jobs 1 --timeout 7200 \
2>&1 | tee native-linux-ghc-phase-trace.log
- name: Upload native Linux GHC phase log
+5 -2
View File
@@ -119,8 +119,11 @@ After a failed native x86_64 Linux library build, CI tries a separate derivation
with `-v2 -ddump-timings` on compile calls and uploads
`native-linux-ghc-phase-trace.log`, including when that trace fails. Compiler
queries and the original source, plan, dependency units and GHC arguments stay
unchanged. The canonical build remains failed. The trace has one job/core and a
two-hour wall-clock/per-derivation bound; the job's six-hour limit stays in place.
unchanged. The canonical build remains failed. The trace runs one derivation at
a time and inherits the canonical Nix core setting, preserving Setup's job count
and the compiler job arguments. It has a two-hour wall-clock/per-derivation
bound; the job's six-hour limit stays in place. A local `--cores` override also
changes those job arguments and must be reported when comparing diagnostics.
`trace-native-ghc.nix` accepts the original component via `--arg original` for the
same diagnostic locally.