From 158220006b08caa2d021ab9b6fb8dca67d844f61 Mon Sep 17 00:00:00 2001
From: vrifox <vrifox@vrifox.cc>
Date: Wed, 29 Mar 2023 22:16:22 +0200
Subject: [PATCH] [CI/CD] combine steps

---
 .woodpecker.yml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 6917f98..56bf658 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -5,19 +5,14 @@ pipeline:
       - pacman -Syu --noconfirm hugo git
       - hugo --destination /woodpecker/build/vrifox.cc/ --minify --cleanDestinationDir
 
-  prepare-ssh: 
-    image: archlinux
-    commands:
-      - mkdir -p /root/.ssh
-      - echo "$SSH_KEY" > /root/.ssh/id_25519
-      - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > /root/.ssh/config
-    secrets: [ ssh_key ]
-
   upload: 
     image: archlinux
     commands:
       - pacman -Syu --noconfirm openssh rsync
+      - mkdir -p /root/.ssh
+      - echo "$SSH_KEY" > /root/.ssh/id_25519
+      - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > /root/.ssh/config
       - rsync -rv -e "ssh -p $SSH_PORT -i /root/.ssh/id_ed25519" /woodpecker/build/ woodpecker@$SSH_HOST:/home/woodpecker/build/vrifox.cc/ --checksum
-    secrets: [ ssh_port, ssh_host ]
+    secrets: [ ssh_key, ssh_port, ssh_host ]
 
 branches: main
\ No newline at end of file