.forgejo/workflows/build_preview.yml

@@ -69,7 +69,7 @@ jobs:
     needs: [ build-site ]
     if: success()
     runs-on: docker
-    container: forgejo.neshweb.net/firq/dockge-cli:0.1.2
+    container: forgejo.neshweb.net/firq/dockge-cli:0.1.1-c.2
     steps:
       - name: Configure Dockge CLI
         run: |
@@ -80,18 +80,3 @@ jobs:
           dockge status fgo-ta-com-preview
           dockge update fgo-ta-com-preview
           dockge status fgo-ta-com-preview
-
-  run-unlighthouse:
-    needs: [ build-site ]
-    if: success()
-    runs-on: docker
-    steps:
-      - name: Launch workflow
-        run: |
-          payload="{\"ref\": \"${GITHUB_REF_NAME}\", \"inputs\": { \"containertag\": \"${GITHUB_REF_NAME}\" }}"
-          curl -X "POST" \
-          -H "accept: application/json" \
-          -H "Content-Type: application/json" \
-          -H "Authorization: token ${GITHUB_TOKEN}" \
-          -d "${payload}" \
-          "${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/actions/workflows/unlighthouse.yml/dispatches" -v

.forgejo/workflows/build_release.yml

@@ -63,19 +63,3 @@ jobs:
           release-dir: release
           token: ${{ secrets.FORGEJO_TOKEN }}
           tag: ${{  github.ref_name }}
-
-  auto-deploy-dockge:
-    needs: [ build-site ]
-    if: success()
-    runs-on: docker
-    container: forgejo.neshweb.net/firq/dockge-cli:0.1.2
-    steps:
-      - name: Configure Dockge CLI
-        run: |
-          dockge host '${{ vars.DOCKGE_HOST }}'
-          dockge login --user '${{ secrets.DOCKGE_USER }}' --password '${{ secrets.DOCKGE_CREDENTIAL }}'
-      - name: Check status and redeploy
-        run: |
-          dockge status fgo-ta-com
-          dockge update fgo-ta-com
-          dockge status fgo-ta-com

.forgejo/workflows/unlighthouse.yml

@@ -1,36 +1,17 @@
-name: Run unlighthouse-tests [Downstream pipeline]
-run-name: Run unlighthouse-tests [Downstream pipeline] for version ${{ inputs.containertag }}
 on:
-  workflow_dispatch:
+  push:
-    inputs:
+    tags:
-      containertag:
+      - '[0-9]+\.[0-9]+\.[0-9]+-ulh\.[0-9]+'
-        description: "Tag of the container to test"
-        default: "preview"
-        type: "string"
 
 jobs:
   unlighthouse:
     runs-on: docker
-    container: 
+    container: forgejo.neshweb.net/ci-docker-images/unlighthouse:0.2.1
-      image: forgejo.neshweb.net/ci-docker-images/unlighthouse:0.3.0
-    services:
-      website:
-        image: forgejo.neshweb.net/firq/fgo-ta-com-website:${{ inputs.containertag }}
-        options: >-
-          --workdir /
     steps:
       - name: Checkout repository
         uses: https://code.forgejo.org/actions/checkout@v3 
-      - name: Check availability
-        run: |
-          while [ "$(curl -o /dev/null -s -w '%{http_code}' http://localhost:8081/)" -ne 200 ];
-            do echo "Waiting...";
-            sleep 5;
-          done;
       - name: Run unlighthouse
-        run: unlighthouse-ci --site "http://localhost:8081/"
+        run: unlighthouse-ci --site "https://preview.fgo-ta.com/" --disable-dynamic-sampling
-      - name: Replace URLs
-        run: find ./unlighthouse-reports -type f | xargs sed -i "s|http://localhost:8081|https://preview.fgo-ta.com|g";
       - name: Prepare artifacts
         run: cp serve.json unlighthouse-reports
       - name: Upload reports
@@ -38,54 +19,79 @@ jobs:
         with:
           name: unlighthouse-reports
           path: unlighthouse-reports/
-      - name: Upload Dockerfile
-        uses: actions/upload-artifact@v3
-        with:
-          name: dockerfile
-          path: Dockerfile.reports
 
-  build-site:
+  deploy-unlighthouse-files:
     needs: [ unlighthouse ]
     if: success()
-    runs-on: dind
+    runs-on: docker
+    env: 
+      DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
+      DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
     steps:
-      - name: Downloading static site artifacts
+      - name: Install and update ssh + rsync
-        uses: actions/download-artifact@v3
+        run: |
-        with:
+            which rsync || ( apt update -y && apt install rsync -y)
-          name: dockerfile
+            which ssh-agent || ( apt update -y && apt install openssh-client -y)            
       - name: Downloading static site artifacts
         uses: actions/download-artifact@v3
         with:
           name: unlighthouse-reports
-          path: reports
+          path: public
-      - name: Set up Docker Buildx
+      - name: Install SSH Key
-        uses: docker/setup-buildx-action@v3
+        uses: https://github.com/shimataro/ssh-key-action@v2
-      - name: Log into Docker Package Registry
-        uses: docker/login-action@v3
         with:
-          registry: forgejo.neshweb.net
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
-          username: ${{ secrets.FORGEJO_USERNAME }}
+          known_hosts: unnecessary
-          password: ${{ secrets.FORGEJO_TOKEN }}
+      - name: Adding Known Hosts
-      - name: Build and push to Docker Package Registry
+        run: ssh-keyscan -H ${{ secrets.DEPLOY_HOST }} >> ~/.ssh/known_hosts
-        uses: docker/build-push-action@v5
+      - name: Stop screen session, delete old files
+        uses: https://github.com/appleboy/ssh-action@master
         with:
-          context: .
+          host: ${{ env.DEPLOY_HOST }}
-          file: Dockerfile.reports
+          username: ${{ env.DEPLOY_USER }}
-          push: true
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
-          tags: forgejo.neshweb.net/firq/fgo-ta-com-website-unlighthouse:latest
+          script: |
+            screen -X -S fgo_ta_com-unlighthouse kill
+            rm -r -f fgo_ta_com/unlighthouse/*            
+      - name: Copy files using rsync
+        run: rsync -az --stats public/* ${{ env.DEPLOY_USER }}@${{ env.DEPLOY_HOST }}:~/fgo_ta_com/unlighthouse
+      - name: Check files on deploy target
+        uses: https://github.com/appleboy/ssh-action@master
+        with:
+          host: ${{ env.DEPLOY_HOST }}
+          username: ${{ env.DEPLOY_USER }}
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          script: |
+            cd fgo_ta_com
+            find unlighthouse -maxdepth 1 -printf "%p\n"            
 
-  auto-deploy-dockge:
+  deploy-unlighthouse-site:
-    needs: [ build-site ]
+    needs: [ deploy-unlighthouse-files ]
     if: success()
     runs-on: docker
-    container: forgejo.neshweb.net/firq/dockge-cli:0.1.2
+    env: 
+      DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
+      DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
     steps:
-      - name: Configure Dockge CLI
+      - name: Install and update ssh + rsync
         run: |
-          dockge host '${{ vars.DOCKGE_HOST }}'
+            which rsync || ( apt update -y && apt install rsync -y)
-          dockge login --user '${{ secrets.DOCKGE_USER }}' --password '${{ secrets.DOCKGE_CREDENTIAL }}'
+            which ssh-agent || ( apt update -y && apt install openssh-client -y)            
-      - name: Check status and redeploy
+      - name: Install SSH Key
-        run: |
+        uses: https://github.com/shimataro/ssh-key-action@v2
-          dockge status fgo-ta-com-unlighthouse
+        with:
-          dockge update fgo-ta-com-unlighthouse
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
-          dockge status fgo-ta-com-unlighthouse
+          known_hosts: unnecessary
+      - name: Adding Known Hosts
+        run: ssh-keyscan -H ${{ secrets.DEPLOY_HOST }} >> ~/.ssh/known_hosts
+      - name: Start new screen session
+        uses: https://github.com/appleboy/ssh-action@master
+        with:
+          host: ${{ env.DEPLOY_HOST }}
+          username: ${{ env.DEPLOY_USER }}
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          script: |
+            PATH="$HOME/.local/bin:$PATH"
+            screen -ls | grep 'fgo_ta_com-unlighthouse' | awk '{print $1}' | xargs -I % -t screen -X -S % quit
+            cd fgo_ta_com
+            screen -S fgo_ta_com-unlighthouse -dm serve unlighthouse/ -p ${{ secrets.UNLIGHTHOUSE_DEPLOY_PORT }}   

Dockerfile.reports

@@ -1,6 +0,0 @@
-FROM forgejo.neshweb.net/ci-docker-images/website-serve:2 AS runtime
-
-ADD reports /public
-
-EXPOSE 8081
-CMD serve public/ -p 8081

astro.config.mjs

@@ -1,12 +1,12 @@
+import { defineConfig } from 'astro/config';
 import sitemap from '@astrojs/sitemap';
 import metaTags from "astro-meta-tags";
-import { defineConfig } from 'astro/config';
 
 export default defineConfig({
   sitemap: true,
   base: '/',
   outDir: 'dist',
-  publicDir: 'public',
+  publicDir: 'static',
   site: 'https://fgo-ta.com/',
   integrations: [sitemap(), metaTags()],
   trailingSlash: "never"

package.json

@@ -1,7 +1,7 @@
 {
   "name": "fgo-ta-com-website",
   "type": "module",
-  "version": "0.2.2-pre.22",
+  "version": "0.2.2-pre.12",
   "scripts": {
     "dev": "astro dev",
     "start": "astro dev",
@@ -11,10 +11,10 @@
   },
   "dependencies": {
     "@astro-community/astro-embed-youtube": "^0.5.2",
-    "@astrojs/check": "^0.9.3",
+    "@astrojs/check": "^0.8.1",
     "@astrojs/sitemap": "^3.1.6",
     "@fontsource/work-sans": "^5.0.18",
-    "astro": "^4.14.3",
+    "astro": "^4.12.2",
     "astro-meta-tags": "^0.3.0",
     "autoprefixer": "^10.4.19",
     "iconoir": "^7.7.0",

serve.json

@@ -12,15 +12,6 @@
         }
       ]
     },
-    {
-      "source": "**/*.woff2",
-      "headers": [
-        {
-          "key": "Cache-Control",
-          "value": "no-cache"
-        }
-      ]
-    },
     {
       "source": "404.html",
       "headers": [