From 14e74374fa23550c4bca02852b81470aae9efa37 Mon Sep 17 00:00:00 2001
From: Freyja Odinthrir <freyja@rayr.me>
Date: Thu, 8 Feb 2024 14:23:50 -0800
Subject: [PATCH] Test new ci

---
 .docker/Dockerfile          |  2 +-
 .gitea/workflows/deploy.yml | 44 +++++++++++++++++++++++++++++++++----
 2 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index a1940b5..b303239 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -8,7 +8,7 @@ FROM alpine:3.17
 RUN apk add nginx supervisor
 RUN mkdir -p /var/www
 RUN rm -rf /etc/nginx
-COPY build /var/www/build
+COPY /dist /var/www/build
 COPY .conf/nginx /etc/nginx
 COPY .conf/supervisor/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index e5bdf08..5d5b534 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -21,13 +21,15 @@ jobs:
       -
         name: Checkout the git repo...
         uses: actions/checkout@v3
+        with:
+          ref: master
       -
         name: Install required system packages...
         run: |
           export DEBIAN_FRONTEND=noninteractive
           apt update
           apt upgrade -y
-          apt install -y graphicsmagick
+          apt install -y graphicsmagick p7zip-full
       -
         name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v2
@@ -42,25 +44,59 @@ jobs:
       -
         name: Build site
         run: npm run build
+      -
+        name: Create artifact...
+        run: 7z a -mx=9 /artifact.7z dist
       -
         name: Upload artifact...
         uses: actions/upload-artifact@v3
         with:
           name: build_artifact
-          path: dist
+          path: /artifact.7z
           retention-days: 7
   job2:
     needs: job1
     name: Build new docker container with new site build...
     runs-on: catthehacker-ubuntu
     steps:
+      -
+        name: Install required system packages...
+        run: |
+          export DEBIAN_FRONTEND=noninteractive
+          apt update
+          apt upgrade -y
+          apt install -y p7zip-full
       -
         name: Download artifact...
         uses: actions/download-artifact@v3
         with:
-          path: dist
+          path: /dist.7z
       -
-        run: ls -R dist
+        run: |
+          7z x /dist.7z /dist; ls /dist
+      # -
+      #   name: Checkout the docker build branch...
+      #   uses: actions/checkout@v3
+      #   with:
+      #     ref: ci-testing
+      # -
+      #   name: Set up docker buildx...
+      #   uses: docker/setup-buildx-action@v3
+      # -
+      #   name: Login to gitea registry
+      #   uses: docker/login-action@v3
+      #   with:
+      #     registry: gitea.raer.me
+      #     username: ${{ secrets.PRODUCTION_REGISTRY_USERNAME }}
+      #     password: ${{ secrets.PRODUCTION_REGISTRY_TOKEN }}
+      # -
+      #   name: Build and push docker image to gitea package store
+      #   uses: docker/build-push-action@v5
+      #   with:
+      #     context: .docker/Dockerfile
+      #     push: true
+      #     platforms: linux/amd64
+      #     tags: gitea.raer.me/${{ gitea.repository }}:${{ gitea.ref_name }}
 
   # job2:
   #   needs: job1