Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
fix(nix): provide lsof to the flake's test sandbox (#3410)
Maximilian Roos57b303fda253
diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yamlindex 035e08d19..941943059 100644--- a/.github/workflows/nightly.yaml+++ b/.github/workflows/nightly.yaml@@ -12,8 +12,8 @@ name: nightly# - link-check: lychee over tracked .md/.txt files (external-link volatility)## Runs daily on cron, on demand via workflow_dispatch, on pushes to main that-# touch dependency or toolchain files, and on PRs that either (a) touch the-# same dependency/toolchain files or (b) carry the `nightly` label. The+# touch dependency, toolchain, or nix packaging files, and on PRs that either+# (a) touch the same files or (b) carry the `nightly` label. The# label is the iteration knob for fixes targeting nightly-only failures# (e.g. nix-flake's sandbox suite); without it, contributors had to wait for# the cron run or `gh workflow run` manually. The cron still catches drift@@ -33,6 +33,9 @@ on:- '**/Cargo.toml'- 'Cargo.lock'- 'rust-toolchain.toml'+ - 'flake.nix'+ - 'flake.lock'+ - 'nix/**'- '.github/workflows/nightly.yaml'pull_request:branches: [main]@@ -56,8 +59,8 @@ jobs:# Decides whether to run on PR events. Non-PR events (cron,# workflow_dispatch, push) pass through unconditionally. PR events# run when either the `nightly` label is attached OR the diff touches- # one of the dependency/toolchain files. The decision is exposed via- # `outputs.run`; downstream jobs gate on it.+ # one of the dependency/toolchain/nix files. The decision is exposed+ # via `outputs.run`; downstream jobs gate on it.## `dorny/paths-filter` works against the GitHub API for PR events, so# no checkout step is needed.@@ -76,6 +79,9 @@ jobs:- '**/Cargo.toml'- 'Cargo.lock'- 'rust-toolchain.toml'+ - 'flake.nix'+ - 'flake.lock'+ - 'nix/**'- '.github/workflows/nightly.yaml'- id: deciderun: |diff --git a/flake.nix b/flake.nixindex 5a2880d2e..106ac2563 100644--- a/flake.nix+++ b/flake.nix@@ -158,12 +158,14 @@src = pkgs.lib.cleanSource ./.;# Tests shell out to a few host tools — `git` for the harness,# `python3` for argv-quoting and post-start fixtures, `ps`- # (procps) for the pgid invariant test. Without these on PATH+ # (procps) for the pgid invariant test, `lsof` for the+ # `--reap` process-discovery test. Without these on PATH# the sandbox surfaces them as `No such file or directory`.nativeBuildInputs = commonArgs.nativeBuildInputs ++ [pkgs.gitpkgs.python3pkgs.procps+ pkgs.lsof];});diff --git a/tests/integration_tests/remove.rs b/tests/integration_tests/remove.rsindex 52b9cbfaa..5e493acb3 100644--- a/tests/integration_tests/remove.rs+++ b/tests/integration_tests/remove.rs@@ -90,7 +90,10 @@ fn test_remove_reap_kills_process(mut repo: TestRepo) {.iter().any(|p| p.pid == pid){- assert!(Instant::now() < deadline, "child {pid} never discovered");+ assert!(+ Instant::now() < deadline,+ "child {pid} never discovered — is lsof installed and able to read process cwds?"+ );std::thread::sleep(Duration::from_millis(50));}