diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index c984ff4d35..bfdbe453e7 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -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 diff --git a/scripts/nix/README.md b/scripts/nix/README.md index 4a12121a08..b0e9a9f125 100644 --- a/scripts/nix/README.md +++ b/scripts/nix/README.md @@ -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.