From 04210490aa826567fddc71c9372bf5aa7c4fe2d4 Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Tue, 8 Nov 2022 11:22:08 -0800 Subject: [PATCH 01/14] Add new CI jobs that test install/uninstall --- .github/workflows/ci.yml | 48 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a938dbb..16e7903 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,6 +82,31 @@ jobs: path: | result/bin/harmonic + RunX86Linux: + runs-on: ubuntu-latest + needs: BuildX86Linux + env: + RUST_LOG: harmonic=trace + RUST_BACKTRACE: full + steps: + - uses: actions/download-artifact@v3 + with: + name: harmonic-x86_64-linux + path: harmonic + - name: Set executable + run: chmod +x ./harmonic + - name: Initial install + run: ./harmonic install linux-multi --no-confirm + - name: Test run + run: nix run nixpkgs#fortune + - name: Initial uninstall + run: ./harmonic uninstall --no-confirm + - name: Repeated install + run: ./harmonic install linux-multi --no-confirm + - name: Repeated uninstall + run: ./harmonic uninstall --no-confirm + + BuildX86Darwin: runs-on: macos-latest steps: @@ -99,3 +124,26 @@ jobs: name: harmonic-x86_64-darwin path: | result/bin/harmonic + + RunX86Darwin: + runs-on: macos-latest + needs: BuildX86Darwin + env: + RUST_LOG: harmonic=trace + RUST_BACKTRACE: full + steps: + - uses: actions/download-artifact@v3 + with: + name: harmonic-x86_64-darwin + path: harmonic + - name: Initial install + run: ./harmonic install darwin-multi --no-confirm + - name: Test run + run: nix run nixpkgs#fortune + - name: Initial uninstall + run: ./harmonic uninstall --no-confirm + - name: Repeated install + run: ./harmonic install darwin-multi --no-confirm + - name: Repeated uninstall + run: ./harmonic uninstall --no-confirm + \ No newline at end of file From eec8479c79c4ca1809d46823d2b5c396e22a24e3 Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Tue, 8 Nov 2022 11:30:49 -0800 Subject: [PATCH 02/14] Laugh at the sheer ridiculousness of my life --- .github/workflows/ci.yml | 88 ++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 16e7903..e53c6ed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,29 +82,29 @@ jobs: path: | result/bin/harmonic - RunX86Linux: - runs-on: ubuntu-latest - needs: BuildX86Linux - env: - RUST_LOG: harmonic=trace - RUST_BACKTRACE: full - steps: - - uses: actions/download-artifact@v3 - with: - name: harmonic-x86_64-linux - path: harmonic - - name: Set executable - run: chmod +x ./harmonic - - name: Initial install - run: ./harmonic install linux-multi --no-confirm - - name: Test run - run: nix run nixpkgs#fortune - - name: Initial uninstall - run: ./harmonic uninstall --no-confirm - - name: Repeated install - run: ./harmonic install linux-multi --no-confirm - - name: Repeated uninstall - run: ./harmonic uninstall --no-confirm + RunX86Linux: + runs-on: ubuntu-latest + needs: BuildX86Linux + env: + RUST_LOG: harmonic=trace + RUST_BACKTRACE: full + steps: + - uses: actions/download-artifact@v3 + with: + name: harmonic-x86_64-linux + path: harmonic + - name: Set executable + run: chmod +x ./harmonic + - name: Initial install + run: ./harmonic install linux-multi --no-confirm + - name: Test run + run: nix run nixpkgs#fortune + - name: Initial uninstall + run: ./harmonic uninstall --no-confirm + - name: Repeated install + run: ./harmonic install linux-multi --no-confirm + - name: Repeated uninstall + run: ./harmonic uninstall --no-confirm BuildX86Darwin: @@ -125,25 +125,25 @@ jobs: path: | result/bin/harmonic - RunX86Darwin: - runs-on: macos-latest - needs: BuildX86Darwin - env: - RUST_LOG: harmonic=trace - RUST_BACKTRACE: full - steps: - - uses: actions/download-artifact@v3 - with: - name: harmonic-x86_64-darwin - path: harmonic - - name: Initial install - run: ./harmonic install darwin-multi --no-confirm - - name: Test run - run: nix run nixpkgs#fortune - - name: Initial uninstall - run: ./harmonic uninstall --no-confirm - - name: Repeated install - run: ./harmonic install darwin-multi --no-confirm - - name: Repeated uninstall - run: ./harmonic uninstall --no-confirm + RunX86Darwin: + runs-on: macos-latest + needs: BuildX86Darwin + env: + RUST_LOG: harmonic=trace + RUST_BACKTRACE: full + steps: + - uses: actions/download-artifact@v3 + with: + name: harmonic-x86_64-darwin + path: harmonic + - name: Initial install + run: ./harmonic install darwin-multi --no-confirm + - name: Test run + run: nix run nixpkgs#fortune + - name: Initial uninstall + run: ./harmonic uninstall --no-confirm + - name: Repeated install + run: ./harmonic install darwin-multi --no-confirm + - name: Repeated uninstall + run: ./harmonic uninstall --no-confirm \ No newline at end of file From bb298efbdb14c498052f0485fff165bf39db7359 Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Tue, 8 Nov 2022 11:48:12 -0800 Subject: [PATCH 03/14] Use artifact names better --- .github/workflows/ci.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e53c6ed..cd367ec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,7 +92,10 @@ jobs: - uses: actions/download-artifact@v3 with: name: harmonic-x86_64-linux - path: harmonic + - name: Rename artifact + run: | + ls -R + mv harmonic-x86_64-linux harmonic - name: Set executable run: chmod +x ./harmonic - name: Initial install @@ -135,7 +138,10 @@ jobs: - uses: actions/download-artifact@v3 with: name: harmonic-x86_64-darwin - path: harmonic + - name: Rename artifact + run: | + ls -R + mv harmonic-x86_64-darwin harmonic - name: Initial install run: ./harmonic install darwin-multi --no-confirm - name: Test run From d900830f040b91cfb8662f6a2b460a892cfb99c0 Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Tue, 8 Nov 2022 12:07:34 -0800 Subject: [PATCH 04/14] No rename --- .github/workflows/ci.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd367ec..2e7cfc3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,10 +92,6 @@ jobs: - uses: actions/download-artifact@v3 with: name: harmonic-x86_64-linux - - name: Rename artifact - run: | - ls -R - mv harmonic-x86_64-linux harmonic - name: Set executable run: chmod +x ./harmonic - name: Initial install @@ -138,10 +134,6 @@ jobs: - uses: actions/download-artifact@v3 with: name: harmonic-x86_64-darwin - - name: Rename artifact - run: | - ls -R - mv harmonic-x86_64-darwin harmonic - name: Initial install run: ./harmonic install darwin-multi --no-confirm - name: Test run From 47ae6398f81c5ded971a280d26704c0c4adc1c8e Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Tue, 8 Nov 2022 12:21:02 -0800 Subject: [PATCH 05/14] Use sudo and don't try to prompt on no-confirm --- .github/workflows/ci.yml | 8 ++++---- src/cli/subcommand/install.rs | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2e7cfc3..c9e652f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -135,13 +135,13 @@ jobs: with: name: harmonic-x86_64-darwin - name: Initial install - run: ./harmonic install darwin-multi --no-confirm + run: sudo ./harmonic install darwin-multi --no-confirm - name: Test run run: nix run nixpkgs#fortune - name: Initial uninstall - run: ./harmonic uninstall --no-confirm + run: sudo ./harmonic uninstall --no-confirm - name: Repeated install - run: ./harmonic install darwin-multi --no-confirm + run: sudo ./harmonic install darwin-multi --no-confirm - name: Repeated uninstall - run: ./harmonic uninstall --no-confirm + run: sudo ./harmonic uninstall --no-confirm \ No newline at end of file diff --git a/src/cli/subcommand/install.rs b/src/cli/subcommand/install.rs index 38f1fc8..1d69d4e 100644 --- a/src/cli/subcommand/install.rs +++ b/src/cli/subcommand/install.rs @@ -61,8 +61,10 @@ impl CommandExecute for Install { if let Err(err) = plan.install().await { tracing::error!("{:?}", eyre!(err)); - if !interaction::confirm(plan.describe_revert(explain)).await? { - interaction::clean_exit_with_message("Okay, didn't do anything! Bye!").await; + if !no_confirm { + if !interaction::confirm(plan.describe_revert(explain)).await? { + interaction::clean_exit_with_message("Okay, didn't do anything! Bye!").await; + } } plan.revert().await? } From 1a88add8c5b920cd3d173f5f469648acc68169ee Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Tue, 8 Nov 2022 12:48:49 -0800 Subject: [PATCH 06/14] use sudo on linux as well... --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c9e652f..222d2ea 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -95,15 +95,15 @@ jobs: - name: Set executable run: chmod +x ./harmonic - name: Initial install - run: ./harmonic install linux-multi --no-confirm + run: sudo ./harmonic install linux-multi --no-confirm - name: Test run run: nix run nixpkgs#fortune - name: Initial uninstall - run: ./harmonic uninstall --no-confirm + run: sudo ./harmonic uninstall --no-confirm - name: Repeated install - run: ./harmonic install linux-multi --no-confirm + run: sudo ./harmonic install linux-multi --no-confirm - name: Repeated uninstall - run: ./harmonic uninstall --no-confirm + run: sudo ./harmonic uninstall --no-confirm BuildX86Darwin: From d56421d3456a5102e04f04afd329a1b6ba1a13c3 Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Tue, 8 Nov 2022 13:04:19 -0800 Subject: [PATCH 07/14] Do a better job setting env vars --- .github/workflows/ci.yml | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 222d2ea..3f7b14e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -85,9 +85,6 @@ jobs: RunX86Linux: runs-on: ubuntu-latest needs: BuildX86Linux - env: - RUST_LOG: harmonic=trace - RUST_BACKTRACE: full steps: - uses: actions/download-artifact@v3 with: @@ -95,15 +92,17 @@ jobs: - name: Set executable run: chmod +x ./harmonic - name: Initial install - run: sudo ./harmonic install linux-multi --no-confirm + run: sudo RUST_LOG=harmonic=trace RUST_BACKTRACE=full ./harmonic install linux-multi --no-confirm - name: Test run - run: nix run nixpkgs#fortune + run: | + source + nix run nixpkgs#fortune - name: Initial uninstall - run: sudo ./harmonic uninstall --no-confirm + run: sudo RUST_LOG=harmonic=trace RUST_BACKTRACE=full ./harmonic uninstall --no-confirm - name: Repeated install - run: sudo ./harmonic install linux-multi --no-confirm + run: sudo RUST_LOG=harmonic=trace RUST_BACKTRACE=full ./harmonic install linux-multi --no-confirm - name: Repeated uninstall - run: sudo ./harmonic uninstall --no-confirm + run: sudo RUST_LOG=harmonic=trace RUST_BACKTRACE=full ./harmonic uninstall --no-confirm BuildX86Darwin: @@ -127,21 +126,20 @@ jobs: RunX86Darwin: runs-on: macos-latest needs: BuildX86Darwin - env: - RUST_LOG: harmonic=trace - RUST_BACKTRACE: full steps: - uses: actions/download-artifact@v3 with: name: harmonic-x86_64-darwin - name: Initial install - run: sudo ./harmonic install darwin-multi --no-confirm + run: sudo RUST_LOG=harmonic=trace RUST_BACKTRACE=full ./harmonic install darwin-multi --no-confirm - name: Test run - run: nix run nixpkgs#fortune + run: | + source + nix run nixpkgs#fortune - name: Initial uninstall - run: sudo ./harmonic uninstall --no-confirm + run: sudo RUST_LOG=harmonic=trace RUST_BACKTRACE=full ./harmonic uninstall --no-confirm - name: Repeated install - run: sudo ./harmonic install darwin-multi --no-confirm + run: sudo RUST_LOG=harmonic=trace RUST_BACKTRACE=full ./harmonic install darwin-multi --no-confirm - name: Repeated uninstall - run: sudo ./harmonic uninstall --no-confirm + run: sudo RUST_LOG=harmonic=trace RUST_BACKTRACE=full ./harmonic uninstall --no-confirm \ No newline at end of file From fb4d1c72800e5c9b61a44a8dfba1f7b3cf652400 Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Tue, 8 Nov 2022 13:21:32 -0800 Subject: [PATCH 08/14] source the nix file after install --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3f7b14e..adb6c1d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -95,7 +95,7 @@ jobs: run: sudo RUST_LOG=harmonic=trace RUST_BACKTRACE=full ./harmonic install linux-multi --no-confirm - name: Test run run: | - source + . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh nix run nixpkgs#fortune - name: Initial uninstall run: sudo RUST_LOG=harmonic=trace RUST_BACKTRACE=full ./harmonic uninstall --no-confirm @@ -134,7 +134,7 @@ jobs: run: sudo RUST_LOG=harmonic=trace RUST_BACKTRACE=full ./harmonic install darwin-multi --no-confirm - name: Test run run: | - source + . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh nix run nixpkgs#fortune - name: Initial uninstall run: sudo RUST_LOG=harmonic=trace RUST_BACKTRACE=full ./harmonic uninstall --no-confirm From 6ef10ff50ea62b16495fac094825d6f919f163d1 Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Tue, 8 Nov 2022 13:43:06 -0800 Subject: [PATCH 09/14] Use systemctl disable not enable, don't auto revert in no-confirm --- src/action/linux/start_systemd_unit.rs | 10 +++++++--- src/cli/subcommand/install.rs | 4 +++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/action/linux/start_systemd_unit.rs b/src/action/linux/start_systemd_unit.rs index 7f36f57..5a21f77 100644 --- a/src/action/linux/start_systemd_unit.rs +++ b/src/action/linux/start_systemd_unit.rs @@ -90,9 +90,13 @@ impl Action for StartSystemdUnit { tracing::debug!("Stopping systemd unit"); // TODO(@Hoverbear): Handle proxy vars - execute_command(Command::new("systemctl").arg("stop").arg(format!("{unit}"))) - .await - .map_err(|e| StartSystemdUnitError::Command(e).boxed())?; + execute_command( + Command::new("systemctl") + .arg("disable") + .arg(format!("{unit}")), + ) + .await + .map_err(|e| StartSystemdUnitError::Command(e).boxed())?; tracing::trace!("Stopped systemd unit"); *action_state = ActionState::Completed; diff --git a/src/cli/subcommand/install.rs b/src/cli/subcommand/install.rs index 1d69d4e..4d544d3 100644 --- a/src/cli/subcommand/install.rs +++ b/src/cli/subcommand/install.rs @@ -65,8 +65,10 @@ impl CommandExecute for Install { if !interaction::confirm(plan.describe_revert(explain)).await? { interaction::clean_exit_with_message("Okay, didn't do anything! Bye!").await; } + plan.revert().await? + } else { + return Err(err).wrap_err("Install failure"); } - plan.revert().await? } Ok(ExitCode::SUCCESS) From 4ea3cd221d186eb6dc7f3e92d34a3d31d23bd91f Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Tue, 8 Nov 2022 13:53:56 -0800 Subject: [PATCH 10/14] Actually try to build working code --- src/cli/subcommand/install.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/cli/subcommand/install.rs b/src/cli/subcommand/install.rs index 4d544d3..b208416 100644 --- a/src/cli/subcommand/install.rs +++ b/src/cli/subcommand/install.rs @@ -60,14 +60,15 @@ impl CommandExecute for Install { } if let Err(err) = plan.install().await { - tracing::error!("{:?}", eyre!(err)); + let error = eyre!(err).wrap_err("Install failure"); if !no_confirm { + tracing::error!("{:?}", error); if !interaction::confirm(plan.describe_revert(explain)).await? { interaction::clean_exit_with_message("Okay, didn't do anything! Bye!").await; } plan.revert().await? } else { - return Err(err).wrap_err("Install failure"); + return Err(error); } } From 71e63da4e4788536196e368d10b268e4346f6706 Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Tue, 8 Nov 2022 14:11:45 -0800 Subject: [PATCH 11/14] undo change --- src/action/linux/start_systemd_unit.rs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/action/linux/start_systemd_unit.rs b/src/action/linux/start_systemd_unit.rs index 5a21f77..7f36f57 100644 --- a/src/action/linux/start_systemd_unit.rs +++ b/src/action/linux/start_systemd_unit.rs @@ -90,13 +90,9 @@ impl Action for StartSystemdUnit { tracing::debug!("Stopping systemd unit"); // TODO(@Hoverbear): Handle proxy vars - execute_command( - Command::new("systemctl") - .arg("disable") - .arg(format!("{unit}")), - ) - .await - .map_err(|e| StartSystemdUnitError::Command(e).boxed())?; + execute_command(Command::new("systemctl").arg("stop").arg(format!("{unit}"))) + .await + .map_err(|e| StartSystemdUnitError::Command(e).boxed())?; tracing::trace!("Stopped systemd unit"); *action_state = ActionState::Completed; From a7ab480eea78938b0e93c3b7fa3298c59e014ad3 Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Wed, 9 Nov 2022 09:25:29 -0800 Subject: [PATCH 12/14] Get repeated install working in CI --- .github/workflows/ci.yml | 8 ++++++++ src/action/common/configure_nix_daemon_service.rs | 13 +++++++++++-- src/action/linux/start_systemd_unit.rs | 10 +++++++--- src/planner/linux/multi.rs | 2 +- 4 files changed, 27 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index adb6c1d..0843edf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -101,6 +101,10 @@ jobs: run: sudo RUST_LOG=harmonic=trace RUST_BACKTRACE=full ./harmonic uninstall --no-confirm - name: Repeated install run: sudo RUST_LOG=harmonic=trace RUST_BACKTRACE=full ./harmonic install linux-multi --no-confirm + - name: Repeated test run + run: | + . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh + nix run nixpkgs#fortune - name: Repeated uninstall run: sudo RUST_LOG=harmonic=trace RUST_BACKTRACE=full ./harmonic uninstall --no-confirm @@ -140,6 +144,10 @@ jobs: run: sudo RUST_LOG=harmonic=trace RUST_BACKTRACE=full ./harmonic uninstall --no-confirm - name: Repeated install run: sudo RUST_LOG=harmonic=trace RUST_BACKTRACE=full ./harmonic install darwin-multi --no-confirm + - name: Repeated test run + run: | + . /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh + nix run nixpkgs#fortune - name: Repeated uninstall run: sudo RUST_LOG=harmonic=trace RUST_BACKTRACE=full ./harmonic uninstall --no-confirm \ No newline at end of file diff --git a/src/action/common/configure_nix_daemon_service.rs b/src/action/common/configure_nix_daemon_service.rs index 5e810fd..8f20d8e 100644 --- a/src/action/common/configure_nix_daemon_service.rs +++ b/src/action/common/configure_nix_daemon_service.rs @@ -132,6 +132,15 @@ impl Action for ConfigureNixDaemonService { execute_command(Command::new("systemctl").arg("daemon-reload")) .await .map_err(|e| ConfigureNixDaemonServiceError::Command(e).boxed())?; + + execute_command( + Command::new("systemctl") + .arg("enable") + .arg("--now") + .arg("nix-daemon.socket"), + ) + .await + .map_err(|e| ConfigureNixDaemonServiceError::Command(e).boxed())?; }, }; @@ -181,11 +190,11 @@ impl Action for ConfigureNixDaemonService { .map_err(|e| ConfigureNixDaemonServiceError::Command(e).boxed())?; }, _ => { - execute_command(Command::new("systemctl").args(["disable", SOCKET_SRC])) + execute_command(Command::new("systemctl").args(["disable", SOCKET_SRC, "--now"])) .await .map_err(|e| ConfigureNixDaemonServiceError::Command(e).boxed())?; - execute_command(Command::new("systemctl").args(["disable", SERVICE_SRC])) + execute_command(Command::new("systemctl").args(["disable", SERVICE_SRC, "--now"])) .await .map_err(|e| ConfigureNixDaemonServiceError::Command(e).boxed())?; diff --git a/src/action/linux/start_systemd_unit.rs b/src/action/linux/start_systemd_unit.rs index 7f36f57..5a21f77 100644 --- a/src/action/linux/start_systemd_unit.rs +++ b/src/action/linux/start_systemd_unit.rs @@ -90,9 +90,13 @@ impl Action for StartSystemdUnit { tracing::debug!("Stopping systemd unit"); // TODO(@Hoverbear): Handle proxy vars - execute_command(Command::new("systemctl").arg("stop").arg(format!("{unit}"))) - .await - .map_err(|e| StartSystemdUnitError::Command(e).boxed())?; + execute_command( + Command::new("systemctl") + .arg("disable") + .arg(format!("{unit}")), + ) + .await + .map_err(|e| StartSystemdUnitError::Command(e).boxed())?; tracing::trace!("Stopped systemd unit"); *action_state = ActionState::Completed; diff --git a/src/planner/linux/multi.rs b/src/planner/linux/multi.rs index 54aa3aa..8c2657d 100644 --- a/src/planner/linux/multi.rs +++ b/src/planner/linux/multi.rs @@ -31,7 +31,7 @@ impl Planner for LinuxMulti { Box::new(CreateDirectory::plan("/nix", None, None, 0o0755, true).await?), Box::new(ProvisionNix::plan(self.settings.clone()).await?), Box::new(ConfigureNix::plan(self.settings).await?), - Box::new(StartSystemdUnit::plan("nix-daemon.socket".into()).await?), + // Box::new(StartSystemdUnit::plan("nix-daemon.socket".into()).await?), ], }) } From f2bf7f4073068656d18633a1d7e7a252a2ab67ee Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Wed, 9 Nov 2022 09:33:19 -0800 Subject: [PATCH 13/14] Set executable on mac too --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0843edf..a016630 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -134,6 +134,8 @@ jobs: - uses: actions/download-artifact@v3 with: name: harmonic-x86_64-darwin + - name: Set executable + run: chmod +x ./harmonic - name: Initial install run: sudo RUST_LOG=harmonic=trace RUST_BACKTRACE=full ./harmonic install darwin-multi --no-confirm - name: Test run From 9fa8d0e9486668d345e2114ad87936c2d468e1b5 Mon Sep 17 00:00:00 2001 From: Ana Hobden Date: Wed, 9 Nov 2022 10:13:49 -0800 Subject: [PATCH 14/14] Remove dead code --- src/planner/linux/multi.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/planner/linux/multi.rs b/src/planner/linux/multi.rs index 8c2657d..a32d3c8 100644 --- a/src/planner/linux/multi.rs +++ b/src/planner/linux/multi.rs @@ -31,7 +31,6 @@ impl Planner for LinuxMulti { Box::new(CreateDirectory::plan("/nix", None, None, 0o0755, true).await?), Box::new(ProvisionNix::plan(self.settings.clone()).await?), Box::new(ConfigureNix::plan(self.settings).await?), - // Box::new(StartSystemdUnit::plan("nix-daemon.socket".into()).await?), ], }) }