Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Test --determinate in CI, and fix integration issues #1084

Merged
merged 24 commits into from
Aug 15, 2024
Merged

Test --determinate in CI, and fix integration issues #1084

merged 24 commits into from
Aug 15, 2024

Conversation

grahamc
Copy link
Member

@grahamc grahamc commented Aug 9, 2024

Description
Checklist
  • Formatted with cargo fmt
  • Built with nix build
  • Ran flake checks with nix flake check
  • Added or updated relevant tests (leave unchecked if not applicable)
  • Added or updated relevant documentation (leave unchecked if not applicable)
  • Linked to related issues (leave unchecked if not applicable)
Validating with install.determinate.systems

If a maintainer has added the upload to s3 label to this PR, it will become available for installation via install.determinate.systems:

curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix/pr/$PR_NUMBER | sh -s -- install

grahamc and others added 16 commits August 9, 2024 14:46
@grahamc
fixup ConfigureInitService: handle cases where systemd dosen't have a…
d53df22 
… src
@grahamc
Remove the nixd service file in revert
7fa55c2
@grahamc
missed one
a63f689
@grahamc
breakpoint
c72da65
@grahamc
update determinate
3b5ef65
@grahamc
?
c847471
@grahamc
help
74cf932
@grahamc
V
eb6e7a6
@grahamc
?
793d27a
@grahamc
?
c7ebbe6
@grahamc
bump
2001ca5
@cole-h
flake.lock: Update
17a968d 
Flake lock file updates:

• Updated input 'determinate/determinate-nixd-aarch64-darwin':
    'https://install.determinate.systems/determinate-nixd/rev/86c4b11d7253132a88cd9a549976f4d20df0bf2b/macOS?narHash=sha256-1w9JUBWVWQCk%2BBK7PX9e7Tsyj1Yk4mEqavJ14H%2BDSXQ%3D'
  → 'https://install.determinate.systems/determinate-nixd/rev/948f25bd2d5742ee96ec938d9ae7709e4458420c/macOS?narHash=sha256-l7O%2BD9w8YBYIceeAMalRl8htBQqHlzTdDpel8RHMjLg%3D'
• Updated input 'determinate/determinate-nixd-aarch64-linux':
    'https://install.determinate.systems/determinate-nixd/rev/86c4b11d7253132a88cd9a549976f4d20df0bf2b/aarch64-linux?narHash=sha256-HnCWt6YSrCSH/UCDy2gZTVVOAB3IdqRocL5N8f%2B5bDM%3D'
  → 'https://install.determinate.systems/determinate-nixd/rev/948f25bd2d5742ee96ec938d9ae7709e4458420c/aarch64-linux?narHash=sha256-pe75u0gwtwBTo2i2lsNU636EARrU93hLVndRXrcdYBA%3D'
• Updated input 'determinate/determinate-nixd-x86_64-linux':
    'https://install.determinate.systems/determinate-nixd/rev/86c4b11d7253132a88cd9a549976f4d20df0bf2b/x86_64-linux?narHash=sha256-TtPPHtY54INYXxKSbbATsjuo5x0TLxv25K1GPCz044w%3D'
  → 'https://install.determinate.systems/determinate-nixd/rev/948f25bd2d5742ee96ec938d9ae7709e4458420c/x86_64-linux?narHash=sha256-jdVMi3vpL8xweNWW5w1ku2tGPS60P/qDfp825beXroo%3D'
@grahamc
Wait for bootout to complete
3eab71f
@grahamc
Brekapoint
b8f9c4c
@grahamc
Correct boolean inversion on unmounted disks
35f3645
@grahamc
Fixup is_mounted check
3eeadcc
@grahamc grahamc added the upload to s3 The labeled PR is allowed to upload its artifacts to S3 for easy testing label Aug 14, 2024
cole-h
cole-h reviewed Aug 14, 2024
View reviewed changes
.github/workflows/ci.yml Outdated Show resolved Hide resolved
src/action/common/configure_determinate_nixd_init_service/mod.rs Show resolved Hide resolved
src/action/common/configure_determinate_nixd_init_service/mod.rs Outdated Show resolved Hide resolved
src/action/common/configure_init_service.rs Outdated Show resolved Hide resolved
src/action/common/configure_init_service.rs Show resolved Hide resolved
src/os/darwin/diskutil.rs Show resolved Hide resolved
src/action/macos/create_determinate_nix_volume.rs Outdated Show resolved Hide resolved
@grahamc grahamc marked this pull request as ready for review August 14, 2024 15:18
cole-h
cole-h approved these changes Aug 14, 2024
View reviewed changes
Copy link
Member

@cole-h cole-h left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Else LGTM.

flake.nix Outdated Show resolved Hide resolved
grahamc and others added 2 commits August 15, 2024 12:53
@grahamc
Launchdupd (#1088)
5774e2b 
* Fixup socket activation to use other paths

* Create a CreateDeterminateVolumeService for mounting

* oops: actually run the steps

* Fixup nits

* re-lock dnidx
@cole-h
flake.lock: Update determinate, remove determinate-nixd input overrides
3df43b1 
Flake lock file updates:

• Updated input 'determinate':
    'https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.66%2Brev-fba019bd147f9b294210824514a4632737289af2/019132bb-fce1-769d-b5b2-9c2da35fd178/source.tar.gz?narHash=sha256-csYhSmOLgECu8/rLxMFsUN4Oj6upqn9kCYjPv7wft8s%3D' (2024-08-08)
  → 'https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.79%2Brev-d4641809cba36cb41a0546d2ef9a6f73e96f7528/01915744-ae45-7ab9-a7e4-66db2d5f8263/source.tar.gz?narHash=sha256-G%2BOX5pHEBRbQVNBV1mpWiSQtyeq2FphneLI6UvGfRjw%3D' (2024-08-15)
@cole-h cole-h changed the title Dnixd test Test --determinate in CI, and fix integration issues Aug 15, 2024
@cole-h cole-h merged commit c0cd969 into main Aug 15, 2024
21 checks passed
@cole-h cole-h deleted the dnixd-test branch August 15, 2024 19:25
@cole-h cole-h added this to the 0.21.0 milestone Aug 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cole-h cole-h cole-h approved these changes

Assignees
No one assigned
Labels
upload to s3 The labeled PR is allowed to upload its artifacts to S3 for easy testing
Projects
None yet
Milestone
0.21.0
Development

Successfully merging this pull request may close these issues.
2 participants
@grahamc @cole-h