build: take the git revision from Nix when git is unavailable - #13
Merged
Merged
Conversation
`airlock --version` reported `1.0.0 (unknown)` from every Nix build. [build.rs](build.rs) shells out to `git rev-parse`, and the Nix build sandbox has no git and builds from a store copy of the source with no `.git` directory, so both git calls fail and the fallback wins. build.rs now prefers `AIRLOCK_GIT_HASH` / `AIRLOCK_GIT_DIRTY` when they are set, and the flake passes the revision Nix already resolved when it fetched the source. Cargo builds are unchanged: the variables are unset, so git is still consulted. `self.shortRev` is only present for a clean checkout or a `github:` input; a dirty working tree provides `dirtyShortRev` instead, whose "-dirty" suffix is stripped because `GIT_DIRTY` already carries that. Both paths now render the same string cargo would for the same tree. Claude-Session: https://claude.ai/code/session_01E3R8fS7y8zYjoEzjorYTBJ
paveq
added a commit
that referenced
this pull request
Sep 23, 2026
CI fails now and then with "socket ... has insecure permissions 0o755". It hit run_embedded_exits_on_cancel on #14 and synchronous_startup_explicit_path_uses_parent_as_sandbox_root on #13. The socket gets its mode from the umask at bind time, and the umask is process-wide. synchronous_startup and four socket tests each did umask(077) / bind / umask(old) with no lock, and cargo test runs them on parallel threads. If one thread restores 022 between another thread's swap and its bind, that socket comes out 0755. The post-bind check then rightly refuses it. The swap now lives in bind_owner_only, behind a static mutex, and synchronous_startup and the tests both go through it. The lock is in production code, not a test-only mutex, so the integration test binaries that call synchronous_startup in parallel are covered too. The real daemon binds before any other thread exists, so it never waits on the lock. Stress run of `daemon::` lib tests, 200 iterations at 16 threads: 5 failures before, 0 after.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
airlock --versionreported1.0.0 (unknown)from every Nix build. build.rs shells out togit rev-parse, and the Nix build sandbox has no git and builds from a store copy of the source with no.gitdirectory, so both git calls fail and the fallback wins.build.rs now prefers
AIRLOCK_GIT_HASH/AIRLOCK_GIT_DIRTYwhen they are set, and the flake passes the revision Nix already resolved when it fetched the source. Cargo builds are unchanged: the variables are unset, so git is still consulted.self.shortRevis only present for a clean checkout or agithub:input; a dirty working tree providesdirtyShortRevinstead, whose "-dirty" suffix is stripped becauseGIT_DIRTYalready carries that. Both paths now render the same string cargo would for the same tree.Claude-Session: https://claude.ai/code/session_01E3R8fS7y8zYjoEzjorYTBJ