Merge branch 'silver-main'

.forgejo/workflows/push.yaml

@@ -11,6 +11,14 @@ jobs:
     steps:
       # Step 1: Checkout the repository
       - uses: https://code.forgejo.org/actions/checkout@v4
+<<<<<<< HEAD
+=======
+      # Make sure all files are pulled down
+      - uses: https://forgejo.skynet.ie/Skynet/actions/get_lfs@v6
+        with:
+          repository: ${{ gitea.repository }}
+          ref_name: ${{ gitea.ref_name }}
+>>>>>>> silver-main
 
       # Step 2: Install latest Hugo
       - name: Install Hugo
@@ -24,6 +32,13 @@ jobs:
       - name: Initialize Submodules
         run: git submodule update --init --recursive
 
+<<<<<<< HEAD
+=======
+      # Step 4: Set the correct URL for skynet
+      - name: Set the site URL correctly
+        run: sed -i "s%baseURL.*%baseURL='https://${{ env.GITHUB_REPOSITORY_OWNER }}.users.skynet.ie'%" hugo.toml && cat hugo.toml
+
+>>>>>>> silver-main
       # Step 4: Build the Hugo site
       - name: Build Hugo site
         env:
@@ -35,4 +50,10 @@ jobs:
         with:
           ssh_key: ${{ secrets.SSH_KEY }}
           username: ${{ env.GITHUB_REPOSITORY_OWNER }}
-          folder: "public"
+<<<<<<< HEAD
+          folder: "public"
+=======
+          folder: "public"
+          # uncomment below if you want to deploy to a subfolder
+          #destination: "subfolder"
+>>>>>>> silver-main