From f2017aaeb4ca31aadc7d23a616783e5483aaa0b5 Mon Sep 17 00:00:00 2001
From: Kiara Grouwstra <kiara@procolix.eu>
Date: Tue, 15 Jul 2025 13:00:47 +0200
Subject: [PATCH] CD: lump SSH commands into a single shell invocation (#462)

Reviewed-on: https://git.fediversity.eu/Fediversity/Fediversity/pulls/462
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
---
 .forgejo/workflows/cd.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.forgejo/workflows/cd.yaml b/.forgejo/workflows/cd.yaml
index f2bc9b7e..5a466259 100644
--- a/.forgejo/workflows/cd.yaml
+++ b/.forgejo/workflows/cd.yaml
@@ -19,8 +19,6 @@ jobs:
           mkdir -p ~/.ssh
           echo "${{ secrets.CD_SSH_KEY }}" > ~/.ssh/id_ed25519
           chmod 600 ~/.ssh/id_ed25519
-          nix-shell --run 'eval "$(ssh-agent -s)"'
-          nix-shell --run 'ssh-add ~/.ssh/id_ed25519'
 
       - name: Deploy
-        run: nix-shell --run 'nixops4 apply default'
+        run: nix-shell --run 'eval "$(ssh-agent -s)" && ssh-add ~/.ssh/id_ed25519 && nixops4 apply default'