From fa84a6ec737af380faeebc53225291b908a4143e Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Tue, 18 Jul 2023 14:01:48 +0100
Subject: [PATCH] ci: upload files from artifact

---
 .github/workflows/ci.yml | 17 ++++++++---------
 justfile                 | 26 +-------------------------
 2 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f4bcb844..2e7440c9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,15 +31,10 @@ jobs:
           nix develop --command yarn build
           ls
 
-      - name: Login to the Docker registry
-        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 # v1.10.0
+      - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
         with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - run: |
-          just push-images ${{ github.sha }}
+          name: dist
+          path: dist
 
   deploy:
     runs-on: ubuntu-latest
@@ -47,7 +42,6 @@ jobs:
       - build
     steps:
       - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # v2.3.4
-      - uses: extractions/setup-just@95b912dc5d3ed106a72907f2f9b91e76d60bdb76 # 1.5.0
 
       - name: Add the deployment SSH key
         uses: shimataro/ssh-key-action@3c9b0fc6f2d223b8450b02a0445f526350fc73e0 # 2.3.1
@@ -56,6 +50,11 @@ jobs:
           name: id_rsa
           known_hosts: ${{ secrets.SSH_KNOWN_HOSTS }}
 
+      - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        with:
+          name: dist
+          path: dist
+
       - run: |
           just deploy ${{ github.sha }}
 
diff --git a/justfile b/justfile
index 19014302..385abd1c 100644
--- a/justfile
+++ b/justfile
@@ -11,31 +11,7 @@ create-daily date title:
   vim $(./tools/scripts/create-daily.sh {{ date }} {{ title }})
 
 deploy sha:
-  rm -fr _deploy
-  docker container rm oliverdavies.uk-build || true
-
-  docker image pull ghcr.io/opdavies/oliverdavies.uk-build:{{ sha }}
-  docker container run --entrypoint sh --name oliverdavies.uk-build ghcr.io/opdavies/oliverdavies.uk-build
-  docker container cp oliverdavies.uk-build:/app/ _deploy
-
-  tree _deploy
-
-  tree -L 2 _deploy
-
-  rsync -r -avhP --delete _deploy/* opdavies@104.248.165.137:/srv/oliverdavies.uk
-
-build-images sha:
-  docker image build . \
-    --target production \
-    -t ghcr.io/opdavies/oliverdavies.uk-build:latest
-
-  docker image build . \
-    --target production \
-    -t ghcr.io/opdavies/oliverdavies.uk-build:{{ sha }}
-
-push-images sha: (build-images sha)
-  docker image push ghcr.io/opdavies/oliverdavies.uk-build:latest
-  docker image push ghcr.io/opdavies/oliverdavies.uk-build:{{ sha }}
+  rsync -r -avhP --delete dist/* opdavies@104.248.165.137:/srv/oliverdavies.uk
 
 format:
   yarn prettier --write src/**/*.{astro,mdx}