From 78f12fd320107b7138d6b106443f80af1bea06b8 Mon Sep 17 00:00:00 2001
From: Isak Kallini <isak.kallini@live.com>
Date: Mon, 24 Feb 2025 15:31:19 +0100
Subject: [PATCH] deploy with bifrost as jumphost

---
 .github/workflows/deploy.yml | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 13f330e1..7206d1b0 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -45,11 +45,23 @@ jobs:
         with:
           files: build.zip
 
-      - name: Copy files to server and deploy
-        shell: bash
-        env:
-          KEY: ${{ secrets.DEPLOY_SSH_KEY }}
-        run: |
-          echo "$DEPLOY_SSH_KEY" > ./key
-          if ! scp -i ./key -oProxyJump=web-ci@hyacinth.blossom.dsek.se build.zip web-ci@web-beta:/var/www "$1"; then $0 "$1"; fi
-          if ! ssh -i ./key -J web-ci@hyacinth.blossom.dsek.se web-ci@web-beta < ./prod/deploy-script.sh "$1"; then $0 "$1"; fi
+      - name: Copy build to server
+        uses: appleboy/scp-action@master
+        with:
+          host: web-beta
+          proxy_host: bifrost.blossom.dsek.se
+          username: web-ci
+          key: ${{ secrets.DEPLOY_SSH_KEY }}
+          proxy_key: ${{ secrets.DEPLOY_SSH_KEY }}
+          source: "build.zip"
+          target: /var/www
+
+      - name: Deploy website on server
+        uses: appleboy/ssh-action@master
+        with:
+          host: web-beta
+          proxy_host: bifrost.blossom.dsek.se
+          username: web-ci
+          key: ${{ secrets.DEPLOY_SSH_KEY }}
+          proxy_key: ${{ secrets.DEPLOY_SSH_KEY }}
+          script_path: ./prod/deploy-script.sh