.forgejo/workflows/build_preview.yml

@@ -4,54 +4,38 @@ on:
       - '[0-9]+\.[0-9]+\.[0-9]+-pre\.[0-9]+'
 
 jobs:
-  check-tag:
-    runs-on: docker
-    steps:
-      - name: Checking Out Repository Code
-        uses: https://code.forgejo.org/actions/checkout@v3
-      - name: Check if Version in package.json matches Tag
-        run: |
-          VERSION=$(npm pkg get version --workspaces=false | tr -d \")
-          if test $VERSION != "${{ github.ref_name }}"; then 
-            echo "Expected Version is: '${{  github.ref_name }}' actual Version is: '$VERSION'"; 
-            exit 1
-          else 
-            echo "Version is: '$VERSION'"; 
-          fi 
-
   checking:
-    needs: [ check-tag ]
     runs-on: docker
-    container: forgejo.neshweb.net/ci-docker-images/node-alpine-git:latest
+    container: node:lts
     steps:
       - name: Checkout source code
         uses: https://code.forgejo.org/actions/checkout@v3
       - name: Install packages
-        run: npm i
+        run: npm install
       - name: Run astro check (linting +  static analysis)
         run: npm run astro check
 
   build-site:
-    needs: [ checking ]
+    needs: [checking]
     if: success()
     runs-on: dind
     steps:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      - name: Log into Docker Package Registry
+      - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           registry: forgejo.neshweb.net
           username: ${{ secrets.FORGEJO_USERNAME }}
           password: ${{ secrets.FORGEJO_TOKEN }}
-      - name: Build and push to Docker Package Registry
+      - name: Push to Package Registry
         uses: docker/build-push-action@v5
         with:
           push: true
           tags: forgejo.neshweb.net/firq/fgo-ta-com-website:${{ github.ref_name }}, forgejo.neshweb.net/firq/fgo-ta-com-website:preview
 
-  create-release:
-    needs: [ build-site ]
+  publish:
+    needs: [build-site]
     if: success()
     runs-on: docker
     steps:
@@ -64,34 +48,3 @@ jobs:
           token: ${{ secrets.FORGEJO_TOKEN }}
           tag: ${{  github.ref_name }}
           prerelease: true
-
-  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-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

@@ -4,54 +4,38 @@ on:
       - '[0-9]+\.[0-9]+\.[0-9]+'
 
 jobs:
-  check-tag:
-    runs-on: docker
-    steps:
-      - name: Checking Out Repository Code
-        uses: https://code.forgejo.org/actions/checkout@v3
-      - name: Check if Version in package.json matches Tag
-        run: |
-          VERSION=$(npm pkg get version --workspaces=false | tr -d \")
-          if test $VERSION != "${{ github.ref_name }}"; then 
-            echo "Expected Version is: '${{  github.ref_name }}' actual Version is: '$VERSION'"; 
-            exit 1
-          else 
-            echo "Version is: '$VERSION'"; 
-          fi 
-
   checking:
-    needs: [ check-tag ]
     runs-on: docker
-    container: forgejo.neshweb.net/ci-docker-images/node-alpine-git:latest
+    container: node:lts
     steps:
       - name: Checkout source code
         uses: https://code.forgejo.org/actions/checkout@v3
       - name: Install packages
-        run: npm i
+        run: npm install
       - name: Run astro check (linting +  static analysis)
         run: npm run astro check
 
   build-site:
-    needs: [ checking ]
+    needs: [checking]
     if: success()
     runs-on: dind
     steps:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      - name: Log into Docker Package Registry
+      - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
           registry: forgejo.neshweb.net
           username: ${{ secrets.FORGEJO_USERNAME }}
           password: ${{ secrets.FORGEJO_TOKEN }}
-      - name: Build and push to Docker Package Registry
+      - name: Push to Package Registry
         uses: docker/build-push-action@v5
         with:
           push: true
           tags: forgejo.neshweb.net/firq/fgo-ta-com-website:${{ github.ref_name }}, forgejo.neshweb.net/firq/fgo-ta-com-website:latest
 
-  create-release:
-    needs: [ build-site ]
+  release:
+    needs: [build-site]
     if: success()
     runs-on: docker
     steps:
@@ -63,19 +47,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/linting.yml

@@ -4,22 +4,13 @@ on:
       - '**'
 
 jobs:
-  get-version:
+  checking:
     runs-on: docker
-    steps:
-      - name: Checking Out Repository Code
-        uses: https://code.forgejo.org/actions/checkout@v3
-      - name: Check if Version in package.json matches Tag
-        run: |
-          VERSION=$(npm pkg get version --workspaces=false | tr -d \")
-          echo "Version is: '$VERSION'"; 
-  astro-check:
-    runs-on: docker
-    container: forgejo.neshweb.net/ci-docker-images/node-alpine-git:latest
+    container: node:lts
     steps:
       - name: Checkout source code
         uses: https://code.forgejo.org/actions/checkout@v3
       - name: Install packages
-        run: npm i
+        run: npm install
       - name: Run astro check (linting +  static analysis)
         run: npm run astro check

.forgejo/workflows/unlighthouse.yml

@@ -1,36 +1,18 @@
-name: Run unlighthouse-tests [Downstream pipeline]
-run-name: Run unlighthouse-tests [Downstream pipeline] for version ${{ inputs.containertag }}
 on:
-  workflow_dispatch:
-    inputs:
-      containertag:
-        description: "Tag of the container to test"
-        default: "preview"
-        type: "string"
+  push:
+    tags:
+      - '[0-9]+\.[0-9]+\.[0-9]+-unlighthouse\.[0-9]+'
+      - '[0-9]+\.[0-9]+\.[0-9]+-ulh\.[0-9]+'
 
 jobs:
   unlighthouse:
     runs-on: docker
-    container: 
-      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 /
+    container: forgejo.neshweb.net/ci-docker-images/unlighthouse:latest
     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/"
-      - name: Replace URLs
-        run: find ./unlighthouse-reports -type f | xargs sed -i "s|http://localhost:8081|https://preview.fgo-ta.com|g";
+        run: unlighthouse-ci --site "https://preview.fgo-ta.com/" --disable-dynamic-sampling
       - name: Prepare artifacts
         run: cp serve.json unlighthouse-reports
       - name: Upload reports
@@ -38,54 +20,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
-        uses: actions/download-artifact@v3
-        with:
-          name: dockerfile
+      - name: Install and update ssh + rsync
+        run: |
+            which rsync || ( apt update -y && apt install rsync -y)
+            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
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Log into Docker Package Registry
-        uses: docker/login-action@v3
+          path: public
+      - name: Install SSH Key
+        uses: https://github.com/shimataro/ssh-key-action@v2
         with:
-          registry: forgejo.neshweb.net
-          username: ${{ secrets.FORGEJO_USERNAME }}
-          password: ${{ secrets.FORGEJO_TOKEN }}
-      - name: Build and push to Docker Package Registry
-        uses: docker/build-push-action@v5
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          known_hosts: unnecessary
+      - name: Adding Known Hosts
+        run: ssh-keyscan -H ${{ secrets.DEPLOY_HOST }} >> ~/.ssh/known_hosts
+      - name: Stop screen session, delete old files
+        uses: https://github.com/appleboy/ssh-action@master
         with:
-          context: .
-          file: Dockerfile.reports
-          push: true
-          tags: forgejo.neshweb.net/firq/fgo-ta-com-website-unlighthouse:latest
+          host: ${{ env.DEPLOY_HOST }}
+          username: ${{ env.DEPLOY_USER }}
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          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:
-    needs: [ build-site ]
+  deploy-unlighthouse-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 }}'
-          dockge login --user '${{ secrets.DOCKGE_USER }}' --password '${{ secrets.DOCKGE_CREDENTIAL }}'
-      - name: Check status and redeploy
-        run: |
-          dockge status fgo-ta-com-unlighthouse
-          dockge update fgo-ta-com-unlighthouse
-          dockge status fgo-ta-com-unlighthouse
+            which rsync || ( apt update -y && apt install rsync -y)
+            which ssh-agent || ( apt update -y && apt install openssh-client -y)            
+      - name: Install SSH Key
+        uses: https://github.com/shimataro/ssh-key-action@v2
+        with:
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          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

@@ -1,16 +1,15 @@
-FROM node:22-alpine AS build
+FROM node:21.5 AS build
 WORKDIR /site
 COPY . .
 RUN npm i
-RUN npm run astro telemetry disable
 RUN npm run build
 
-FROM forgejo.neshweb.net/ci-docker-images/website-serve:2 AS runtime
+FROM forgejo.neshweb.net/ci-docker-images/website-serve:latest AS runtime
 
 COPY --from=build /site/dist /public
 COPY --from=build /site/serve.json /public/serve.json
 
-ENV PORT=8081
+ENV PORT 8081
 EXPOSE 8081
 
-CMD serve public/ -p ${PORT}
+CMD [ "serve", "public/", "-p", "8081" ]

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.1",
   "scripts": {
     "dev": "astro dev",
     "start": "astro dev",
@@ -10,16 +10,15 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@astro-community/astro-embed-youtube": "^0.5.2",
-    "@astrojs/check": "^0.9.3",
-    "@astrojs/sitemap": "^3.1.6",
-    "@fontsource/work-sans": "^5.0.18",
-    "astro": "^4.14.3",
-    "astro-meta-tags": "^0.3.0",
-    "autoprefixer": "^10.4.19",
-    "iconoir": "^7.7.0",
-    "postcss-preset-env": "^9.6.0",
-    "typescript": "^5.5.3"
+    "@astro-community/astro-embed-youtube": "^0.4.3",
+    "@astrojs/check": "^0.5.10",
+    "@astrojs/sitemap": "^3.1.4",
+    "astro": "^4.7.0",
+    "astro-meta-tags": "^0.1.3",
+    "autoprefixer": "^10.4.16",
+    "iconoir": "^7.3.0",
+    "postcss-preset-env": "^9.3.0",
+    "typescript": "^5.3.3"
   },
   "browserslist": [
     "last 2 versions",

serve.json

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