chore(release): bump version to v26.03.21.f [skip ci]

- Add new webp logo and favicon assets
- Replace svg logo references with webp across layouts and pages
- Add favicon.ico and favicon.webp for browser compatibility
- Update BaseLayout to include favicon link

Signed-off-by: Alexander Lyall <alex@adcm.uk>

.gitea/workflows/release.yaml

@@ -15,7 +15,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Stop if this is the bot changelog commit
+      - name: Stop if this is the bot changelog/version commit
         shell: bash
         run: |
           set -e
@@ -36,82 +36,11 @@ jobs:
           sudo install /tmp/git-cliff-*/git-cliff /usr/local/bin/git-cliff
           git-cliff --version
 
-      - name: Generate CHANGELOG.md (Keep a Changelog)
-        shell: bash
-        run: |
-          set -e
-          git-cliff --config cliff.toml --output CHANGELOG.md
-          test -s CHANGELOG.md
-
-      - name: Commit and push CHANGELOG.md if changed (CHANGELOG_PAT)
-        shell: bash
-        env:
-          CHANGELOG_PAT: ${{ secrets.CHANGELOG_PAT }}
-        run: |
-          set -e
-
-          if git diff --quiet -- CHANGELOG.md; then
-            echo "No changelog changes."
-          else
-            git config user.name "changelog-bot"
-            git config user.email "changelog-bot@users.noreply.local"
-
-            git add CHANGELOG.md
-            git commit -m "docs(changelog): update changelog [skip ci]"
-
-            origin_url="$(git remote get-url origin)"
-
-            # Convert SSH origin to HTTPS if needed
-            if echo "$origin_url" | grep -q "^git@"; then
-              host="$(echo "$origin_url" | sed -E 's#git@([^:]+):.*#\1#')"
-              path="$(echo "$origin_url" | sed -E 's#git@[^:]+:(.*)#\1#')"
-              origin_url="https://$host/$path"
-            fi
-
-            authed_url="$(echo "$origin_url" | sed -E "s#^https://#https://oauth2:${CHANGELOG_PAT}@#")"
-            git push "$authed_url" HEAD:main
-          fi
-
-      - name: Extract newest changelog section for release body
-        shell: bash
-        run: |
-          set -e
-          # Extract the first "## ..." section (newest section) from CHANGELOG.md
-          # Includes the "## ..." heading and everything until the next "## ..." heading.
-          awk '
-            /^## / { if (seen) exit; seen=1 }
-            seen { print }
-          ' CHANGELOG.md > RELEASE_NOTES.md
-
-          # Clean trailing whitespace/newlines a bit
-          sed -i 's/[[:space:]]*$//' RELEASE_NOTES.md
-
-          test -s RELEASE_NOTES.md
-          echo "---- RELEASE_NOTES.md ----"
-          head -n 60 RELEASE_NOTES.md
-          echo "--------------------------"
-
-      - name: Create export zip (Computing:Box Website.zip)
-        shell: bash
-        run: |
-          set -e
-          if [ ! -d "dist" ]; then
-            echo "❌ dist/ folder not found in repo root"
-            ls -la
-            exit 1
-          fi
-
-          rm -f "Computing:Box Website.zip"
-          (cd dist && zip -r "../Computing:Box Website.zip" .)
-          test -s "Computing:Box Website.zip"
-          ls -lh "Computing:Box Website.zip"
-
       - name: Prepare YY.MM.DD letter-suffix tag + release name
         shell: bash
         run: |
           set -e
 
-          # Version: YY.MM.DD (UTC). Swap to `date +...` if you prefer UK-local runner time.
           VERSION="$(date -u +'%y.%m.%d')"
           PREFIX="v${VERSION}."
 
@@ -135,12 +64,216 @@ jobs:
           TAG="${PREFIX}${next_letter}"
           RELEASE_NAME="Computing:Box v${VERSION}.${next_letter}"
 
+          origin_url="$(git remote get-url origin)"
+
+          if echo "$origin_url" | grep -q "^git@"; then
+            host="$(echo "$origin_url" | sed -E 's#git@([^:]+):.*#\1#')"
+            path="$(echo "$origin_url" | sed -E 's#git@[^:]+:(.*)#\1#')"
+            origin_url="https://$host/$path"
+          fi
+
+          base="$(echo "$origin_url" | sed -E 's#(https?://[^/]+)/.*#\1#')"
+          repo_path="$(echo "$origin_url" | sed -E 's#https?://[^/]+/##')"
+          repo_path="$(echo "$repo_path" | sed -E 's/\.git$//')"
+
+          RELEASE_URL="${base}/${repo_path}/releases/tag/${TAG}"
+
           echo "TAG=$TAG" >> "$GITHUB_ENV"
           echo "RELEASE_NAME=$RELEASE_NAME" >> "$GITHUB_ENV"
           echo "ZIP_PATH=Computing:Box Website.zip" >> "$GITHUB_ENV"
+          echo "RELEASE_URL=$RELEASE_URL" >> "$GITHUB_ENV"
 
           echo "Using tag: $TAG"
           echo "Release name: $RELEASE_NAME"
+          echo "Release URL: $RELEASE_URL"
+
+      - name: Find previous release tag
+        shell: bash
+        run: |
+          set -e
+
+          PREV_TAG="$(
+            git tag --list 'v*' \
+              | grep -E '^v[0-9]{2}\.[0-9]{2}\.[0-9]{2}[a-z]$' \
+              | grep -Fxv "$TAG" \
+              | sort -V \
+              | tail -n 1 \
+              || true
+          )"
+
+          if [ -n "$PREV_TAG" ]; then
+            echo "PREV_TAG=$PREV_TAG" >> "$GITHUB_ENV"
+            echo "Previous release tag: $PREV_TAG"
+          else
+            echo "PREV_TAG=" >> "$GITHUB_ENV"
+            echo "No previous release tag found."
+          fi
+
+      - name: Generate CHANGELOG.md from previous release to HEAD
+        shell: bash
+        run: |
+          set -e
+
+          if [ -n "${PREV_TAG}" ]; then
+            echo "Generating changelog from ${PREV_TAG}..HEAD"
+            git-cliff --config cliff.toml "${PREV_TAG}..HEAD" --output CHANGELOG.md
+          else
+            echo "Generating changelog from full history"
+            git-cliff --config cliff.toml --output CHANGELOG.md
+          fi
+
+          test -s CHANGELOG.md
+          echo "---- CHANGELOG.md ----"
+          head -n 120 CHANGELOG.md
+          echo "----------------------"
+
+      - name: Commit and push CHANGELOG.md if changed (CHANGELOG_PAT)
+        shell: bash
+        env:
+          CHANGELOG_PAT: ${{ secrets.CHANGELOG_PAT }}
+        run: |
+          set -e
+
+          if git diff --quiet -- CHANGELOG.md; then
+            echo "No changelog changes."
+          else
+            git config user.name "changelog-bot"
+            git config user.email "changelog-bot@users.noreply.local"
+
+            git add CHANGELOG.md
+            git commit -m "docs(changelog): update changelog [skip ci]"
+
+            origin_url="$(git remote get-url origin)"
+
+            if echo "$origin_url" | grep -q "^git@"; then
+              host="$(echo "$origin_url" | sed -E 's#git@([^:]+):.*#\1#')"
+              path="$(echo "$origin_url" | sed -E 's#git@[^:]+:(.*)#\1#')"
+              origin_url="https://$host/$path"
+            fi
+
+            authed_url="$(echo "$origin_url" | sed -E "s#^https://#https://oauth2:${CHANGELOG_PAT}@#")"
+            git push "$authed_url" HEAD:main
+          fi
+
+      - name: Prepare release notes
+        shell: bash
+        run: |
+          set -e
+          cp CHANGELOG.md RELEASE_NOTES.md
+          test -s RELEASE_NOTES.md
+          echo "---- RELEASE_NOTES.md ----"
+          head -n 120 RELEASE_NOTES.md
+          echo "--------------------------"
+
+      - name: Derive semver package version from tag
+        shell: bash
+        run: |
+          set -e
+
+          PACKAGE_VERSION="$(echo "$TAG" | sed -E 's/^v([0-9]{2})\.0?([0-9]{1,2})\.0?([0-9]{1,2})([a-z])$/\1.\2.\3-\4/')"
+
+          if [ -z "$PACKAGE_VERSION" ]; then
+            echo "❌ Failed to derive PACKAGE_VERSION from TAG=$TAG"
+            exit 1
+          fi
+
+          echo "PACKAGE_VERSION=$PACKAGE_VERSION" >> "$GITHUB_ENV"
+          echo "Using package version: $PACKAGE_VERSION"
+
+      - name: Generate version file for Astro footer
+        shell: bash
+        run: |
+          set -e
+          mkdir -p src/generated
+          cat > src/generated/version.json <<EOF
+          {
+            "version": "${TAG}",
+            "url": "${RELEASE_URL}"
+          }
+          EOF
+
+          echo "Generated src/generated/version.json"
+          cat src/generated/version.json
+
+      - name: Set up Node
+        uses: actions/setup-node@v6
+        with:
+          node-version: 25
+          cache: npm
+
+      - name: Check Node version
+        shell: bash
+        run: |
+          node -v
+          npm -v
+
+      - name: Install dependencies
+        shell: bash
+        run: |
+          set -e
+          npm ci
+
+      - name: Update package.json and package-lock.json version
+        shell: bash
+        run: |
+          set -e
+          npm version "$PACKAGE_VERSION" --no-git-tag-version
+
+          echo "package.json version:"
+          node -p "require('./package.json').version"
+
+          echo "package-lock.json version:"
+          node -p "require('./package-lock.json').version"
+
+      - name: Commit and push version bump (CHANGELOG_PAT)
+        shell: bash
+        env:
+          CHANGELOG_PAT: ${{ secrets.CHANGELOG_PAT }}
+        run: |
+          set -e
+
+          if git diff --quiet -- package.json package-lock.json; then
+            echo "No version changes to commit."
+          else
+            git config user.name "release-bot"
+            git config user.email "release-bot@users.noreply.local"
+
+            git add package.json package-lock.json
+            git commit -m "chore(release): bump version to ${PACKAGE_VERSION} [skip ci]"
+
+            origin_url="$(git remote get-url origin)"
+
+            if echo "$origin_url" | grep -q "^git@"; then
+              host="$(echo "$origin_url" | sed -E 's#git@([^:]+):.*#\1#')"
+              path="$(echo "$origin_url" | sed -E 's#git@[^:]+:(.*)#\1#')"
+              origin_url="https://$host/$path"
+            fi
+
+            authed_url="$(echo "$origin_url" | sed -E "s#^https://#https://oauth2:${CHANGELOG_PAT}@#")"
+            git push "$authed_url" HEAD:main
+          fi
+
+      - name: Build Astro site
+        shell: bash
+        run: |
+          set -e
+          npm run build
+          test -d dist
+
+      - name: Create export zip (Computing:Box Website.zip)
+        shell: bash
+        run: |
+          set -e
+          if [ ! -d "dist" ]; then
+            echo "❌ dist/ folder not found in repo root"
+            ls -la
+            exit 1
+          fi
+
+          rm -f "Computing:Box Website.zip"
+          (cd dist && zip -r "../Computing:Box Website.zip" .)
+          test -s "Computing:Box Website.zip"
+          ls -lh "Computing:Box Website.zip"
 
       - name: Create and push tag (CHANGELOG_PAT)
         shell: bash
@@ -153,7 +286,6 @@ jobs:
 
           origin_url="$(git remote get-url origin)"
 
-          # Convert SSH origin to HTTPS if needed
           if echo "$origin_url" | grep -q "^git@"; then
             host="$(echo "$origin_url" | sed -E 's#git@([^:]+):.*#\1#')"
             path="$(echo "$origin_url" | sed -E 's#git@[^:]+:(.*)#\1#')"
@@ -198,7 +330,7 @@ jobs:
               "tag_name": tag,
               "target_commitish": "main",
               "name": name,
-              "body": body,   # newest section only
+              "body": body,
               "draft": False,
               "prerelease": False,
           }
@@ -232,4 +364,4 @@ jobs:
             -F "attachment=@${ZIP_PATH}" \
             >/dev/null
 
-          echo "✅ Release created: ${RELEASE_NAME} (tag: ${TAG}) with asset uploaded"
+          echo "✅ Release created: ${RELEASE_NAME} (tag: ${TAG}) with asset uploaded"

cliff.toml

@@ -0,0 +1,35 @@
+[changelog]
+header = """
+# Changelog
+"""
+
+body = """
+{% for group, commits in commits | group_by(attribute="group") %}
+## {{ group }}
+{% for commit in commits %}
+- {{ commit.message | upper_first }}
+{% endfor %}
+{% endfor %}
+"""
+
+footer = ""
+
+[git]
+conventional_commits = false
+filter_unconventional = false
+split_commits = false
+topo_order = true
+
+# IMPORTANT: match your tag format
+tag_pattern = "^v[0-9]{2}\\.[0-9]{2}\\.[0-9]{2}[a-z]$"
+
+commit_parsers = [
+  { message = "^feat", group = "🚀 Features" },
+  { message = "^fix", group = "🐛 Fixes" },
+  { message = "^refactor", group = "♻️ Refactoring" },
+  { message = "^docs", group = "📚 Documentation" },
+  { message = "^chore", group = "💼 Other" },
+
+  # catch-all so NOTHING is dropped
+  { message = ".*", group = "💼 Other" },
+]

package.json

@@ -1,7 +1,7 @@
 {
   "name": "computing-box",
   "type": "module",
-  "version": "2.0.0",
+  "version": "26.3.2-1.f",
   "scripts": {
     "dev": "astro dev",
     "build": "astro build",
@@ -9,6 +9,6 @@
     "astro": "astro"
   },
   "dependencies": {
-    "astro": "^5.18.0"
+    "astro": "^6.0.8"
   }
 }

src/generated/version.json

@@ -0,0 +1,4 @@
+{
+  "version": "dev",
+  "url": "#"
+}

src/layouts/BaseLayout.astro

@@ -1,5 +1,9 @@
 ---
 import "../styles/global.css";
+import versionInfo from "../generated/version.json";
+
+const version = versionInfo.version;
+const releaseUrl = versionInfo.url;
 const { title = "Computing:Box" } = Astro.props;
 ---
 
@@ -29,12 +33,13 @@ const { title = "Computing:Box" } = Astro.props;
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;700;800;900&display=swap" rel="stylesheet">
+    <link rel="icon" type="image/x-icon" href="/images/favicon.ico" />
   </head>
   <body>
     <header class="siteNav">
       <div class="navInner">
         <a class="brand" href="/">
-          <img class="brandLogo" src="/images/computing-box-logo.svg" alt="Computing:Box logo" />
+          <img class="brandLogo" src="/images/computing-box-logo.webp" alt="Computing:Box logo" />
           <span class="brandName">Computing:Box</span>
         </a>
 
@@ -60,7 +65,10 @@ const { title = "Computing:Box" } = Astro.props;
               <a href="/legal-code" style="margin-left: 32px; color: var(--muted); text-decoration: underline;">Legal Code</a>
           </div>
         <div>Computer Science Concept Simulators</div>
-        <div>© {new Date().getFullYear()} Computing:Box • Created with ♥ by Mr A Lyall</div>
+        <div>    Version:
+    <a href={releaseUrl} target="_blank" rel="noopener noreferrer">
+      {version}
+    </a> • © {new Date().getFullYear()} Computing:Box • Created with ♥ by Mr A Lyall</div>
       </div>
     </footer>
   </body>

src/pages/about.astro

@@ -6,7 +6,7 @@ import BaseLayout from "../layouts/BaseLayout.astro";
   <article style="max-width: 1100px; margin: 0 auto; width: 100%;">
     
     <div style="text-align: center; margin-bottom: 60px;">
-        <img src="/images/computing-box-logo.svg" alt="Computing:Box Logo" style="width: 250px; border-radius: 20px; box-shadow: 0 12px 40px rgba(0,0,0,0.5);" />
+        <img src="/images/computing-box-logo.webp" alt="Computing:Box Logo" style="width: 250px; border-radius: 20px; box-shadow: 0 12px 40px rgba(0,0,0,0.5);" />
         <h1 class="brandName" style="font-size: 42px; margin-top: 20px; color: var(--text);">The New Computing:Box Experience</h1>
     </div>
 

src/pages/index.astro

@@ -17,7 +17,7 @@ import BaseLayout from "../layouts/BaseLayout.astro";
     </div>
     
     <div style="flex: 1; text-align: right;">
-      <img src="/images/computing-box-logo.svg" alt="Computing Box Logo" style="width: 100%; max-width: 450px; filter: drop-shadow(0 0 50px rgba(40, 240, 122, 0.15));" />
+      <img src="/images/computing-box-logo.webp" alt="Computing Box Logo" style="width: 100%; max-width: 450px; filter: drop-shadow(0 0 50px rgba(40, 240, 122, 0.15));" />
     </div>
   </div>
 </BaseLayout>