Merge branch 'master' of git.rogs.me:rogs/yams.media

- Specifies a cache directory for hugo builds.
- Improves build performance by caching hugo assets.
- Sets the cache directory to $PWD/hugo-cache.

.gitea/workflows/deploy.yml

@@ -0,0 +1,49 @@
+name: Hugo Build and Deploy
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  test_build:
+    name: Build Hugo Site
+    runs-on: ubuntu-latest
+    container:
+      image: klakegg/hugo:0.111.3-ext-alpine-ci
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Check Hugo Version and Build
+        run: |
+          hugo version
+          hugo --minify
+
+  deploy:
+    name: Deploy to Server
+    runs-on: ubuntu-latest
+    needs: test_build
+    if: github.ref == 'refs/heads/master'
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Setup SSH and Deploy
+        run: |
+          eval "$(ssh-agent -s)"
+          mkdir -p ~/.ssh
+          echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add -
+          chmod 700 ~/.ssh
+          ssh-keyscan "$SSH_HOST" >> ~/.ssh/known_hosts
+          chmod 644 ~/.ssh/known_hosts
+
+          ssh -p "$SSH_PORT" "$SSH_USER@$SSH_HOST" 'cd repo && git stash && git pull --force origin master && ./build.sh'
+        env:
+          SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+          SSH_USER: ${{ secrets.SSH_USER }}
+          SSH_HOST: ${{ secrets.SSH_HOST }}
+          SSH_PORT: ${{ secrets.SSH_PORT }}

.gitlab-ci.yml

@@ -1,30 +0,0 @@
-image: alpine:latest
-
-stages:
-  - test
-  - deploy
-
-test_build:
-  stage: test
-  image: klakegg/hugo:0.111.3-ext-alpine-ci
-  script:
-    - hugo version
-    - hugo --minify
-  only:
-    - merge_requests
-    - master
-
-deploy:
-  stage: deploy
-  before_script:
-    - 'command -v ssh-agent >/dev/null || ( apk add --update openssh )'
-    - eval $(ssh-agent -s)
-    - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add -
-    - mkdir -p ~/.ssh
-    - chmod 700 ~/.ssh
-    - ssh-keyscan $SSH_HOST >> ~/.ssh/known_hosts
-    - chmod 644 ~/.ssh/known_hosts
-  script:
-    - ssh -p $SSH_PORT $SSH_USER@$SSH_HOST "cd repo && git stash && git pull --force origin master && ./build.sh"
-  only:
-    - master

build.sh

@@ -2,4 +2,4 @@
 
 find ./ -type f -name '*.png' -not -path '*/.git/*' -exec sh -c 'cwebp -lossless $1 -o "${1%.png}.webp"' _ {} \;
 find . -type f -not -path '*/.git/*' -exec sed -i -e 's/\.png/\.webp/g' {} \;
-hugo -s . -d /var/www/yams.media/ --minify --cleanDestinationDir --gc --verbose
+hugo -s . -d /var/www/yams.media/ --minify --cleanDestinationDir --gc --verbose --cacheDir $PWD/hugo-cache

layouts/partials/sub-footer.html

@@ -7,9 +7,15 @@
             <li class="zerostatic">
               <img src="/pics/yams-small.png"/> <a href="https://yams.media">yams.media</a>
             </li>
+            <li class="zerostatic">
+              <img src="/pics/gitea-small.png"/> <a href="https://git.rogs.me/rogs/yams">git.rogs.me/rogs/yams</a>
+            </li>
             <li class="zerostatic">
               <img src="/pics/gitlab-small.png"/> <a href="https://gitlab.com/rogs/yams">gitlab.com/rogs/yams</a>
             </li>
+            <li class="zerostatic">
+              <img src="/pics/github-small.png"/> <a href="https://github.com/rogsme/yams">github.com/rogsme/yams</a>
+            </li>
             <li class="zerostatic">
               <img src="/pics/discord-small.png"/> <a href="https://discord.gg/Gwae3tNMST">Discord</a>
             </li>
@@ -22,7 +28,7 @@
             </li>
             {{ end }}
             <li class="zerostatic">
-              <a href="https://www.buymeacoffee.com/rogs"><img src="https://img.buymeacoffee.com/button-api/?text=Support YAMS&emoji=\U0001f355&slug=rogs&button_colour=40DCA5&font_colour=ffffff&font_family=Lato&outline_colour=000000&coffee_colour=FFDD00" /></a>
+              <a href="https://www.buymeacoffee.com/rogs">🍕 Support YAMS! 🤑</a>
             </li>
           </ul>
         </div>