From 9e32af42574390103525a0b2196e2fd58efec862 Mon Sep 17 00:00:00 2001 From: Kiara Grouwstra Date: Mon, 4 Aug 2025 17:55:05 +0200 Subject: [PATCH] Revert "try store mounted read-only" This reverts commit 586be6f309afb89766ed9f65e08603c030bf0b90. --- .woodpecker/cd.yaml | 6 ++---- .woodpecker/check-deployment-basic.yaml | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.woodpecker/cd.yaml b/.woodpecker/cd.yaml index 26fe0316..e2239917 100644 --- a/.woodpecker/cd.yaml +++ b/.woodpecker/cd.yaml @@ -14,14 +14,12 @@ steps: echo "$CD_SSH_KEY" > ~/.ssh/id_ed25519 ls -l ~/.ssh/id_ed25519 chmod 600 ~/.ssh/id_ed25519 - - nix-shell --eval-store local --store unix:///mnt/nix/var/nix/daemon-socket/socket?root=/mnt -p strace --run 'strace -f -o ssh-agent.log ssh-agent -s' + - nix-shell -p strace --run 'strace -f -o ssh-agent.log ssh-agent -s' - cat ssh-agent.log - | eval "$(ssh-agent -s)" ssh-add ~/.ssh/id_ed25519 - - nix-shell --eval-store local --store unix:///mnt/nix/var/nix/daemon-socket/socket?root=/mnt --run 'eval "$(ssh-agent -s)" && ssh-add ~/.ssh/id_ed25519 && ssh-agent -s && SHELL=$(which bash) nixops4 apply -v default' + - nix-shell --run 'eval "$(ssh-agent -s)" && ssh-add ~/.ssh/id_ed25519 && ssh-agent -s && SHELL=$(which bash) nixops4 apply -v default' environment: CD_SSH_KEY: from_secret: cd_ssh_key - volumes: - - /nix:/mnt/nix:ro diff --git a/.woodpecker/check-deployment-basic.yaml b/.woodpecker/check-deployment-basic.yaml index ab8e957d..9d470181 100644 --- a/.woodpecker/check-deployment-basic.yaml +++ b/.woodpecker/check-deployment-basic.yaml @@ -10,6 +10,4 @@ steps: - name: check-deployment-basic image: nixos/nix commands: - - nix build --eval-store local --store unix:///mnt/nix/var/nix/daemon-socket/socket?root=/mnt --extra-experimental-features 'nix-command flakes' .#checks.x86_64-linux.deployment-basic -L - volumes: - - /nix:/mnt/nix:ro + - nix build --extra-experimental-features 'nix-command flakes' .#checks.x86_64-linux.deployment-basic -L