Merge pull request 'ci: filter main builds to code changes and cancel superseded runs' (#18) from ci/optimise-main-builds into main

Reviewed-on: #18

.gitea/workflows/build-and-publish.yml

@@ -1,10 +1,30 @@
 name: Build and publish container
 
 on:
+  # On merge to main, only build/release when image-affecting files change;
+  # CI-config, Renovate-config and docs changes do not produce a new image.
   push:
     branches: [main]
+    paths:
+      - 'Dockerfile'
+      - 'default.conf'
+      - 'index.html'
+      - 'styles.css'
+      - 'script.js'
+      - 'messages.js'
+      - '.dockerignore'
+  # Pull requests always run (the build is a required check); no path filter.
   pull_request:
     branches: [main]
+  workflow_dispatch:
+
+# A newer run cancels an older in-flight run in the same group (keyed by ref),
+# so a fresh merge to main supersedes the previous build and only the latest
+# release is produced, avoiding tags that would be immediately replaced. Each
+# pull request likewise supersedes only its own earlier runs.
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 defaults:
   run:
@@ -18,7 +38,7 @@ jobs:
       packages: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
         with:
           # Full history and tags are required to derive the next version
           # from the conventional-commit messages since the last release.
@@ -94,21 +114,21 @@ jobs:
           echo "Computed bump=${bump}, release=${release}, base=${base}"
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
+        uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4
 
       - name: Set up Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
 
       - name: Log in to the Gitea container registry
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3
+        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.repository_owner }}
           password: ${{ secrets.PACKAGES_TOKEN }}
 
       - name: Build and push
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7
         with:
           context: .
           platforms: linux/amd64,linux/arm64

renovate.json

@@ -10,20 +10,31 @@
   "semanticCommitType": "fix",
   "semanticCommitScope": "deps",
   "github-actions": {
-    "fileMatch": ["^\\.gitea/workflows/[^/]+\\.ya?ml$"]
+    "managerFilePatterns": ["/^\\.gitea/workflows/[^/]+\\.ya?ml$/"]
   },
   "packageRules": [
     {
       "description": "Group nginx base image updates",
       "matchManagers": ["dockerfile"],
       "groupName": "docker base image"
+    },
+    {
+      "description": "Commit every update as fix(deps) so each merged Renovate PR triggers a patch release. config:recommended pulls in :semanticPrefixFixDepsChoreOthers, which forces non-npm updates (Docker, Actions) to chore and would otherwise produce no release.",
+      "matchPackageNames": ["*"],
+      "semanticCommitType": "fix"
+    },
+    {
+      "description": "Auto-merge patch and minor updates once checks pass.",
+      "matchUpdateTypes": ["patch", "minor"],
+      "automerge": true
     }
   ],
+  "platformAutomerge": true,
   "customManagers": [
     {
       "customType": "regex",
       "description": "Update HTML dependencies annotated with a renovate comment, e.g. <!-- renovate: datasource=npm depName=bootstrap --> before the versioned URL",
-      "fileMatch": ["\\.html$"],
+      "managerFilePatterns": ["/\\.html$/"],
       "matchStrings": [
         "datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)( versioning=(?<versioning>\\S+))?[\\s\\S]*?(?<currentValue>v?\\d+\\.\\d+\\.\\d+[\\w.-]*)"
       ]
@@ -31,7 +42,7 @@
     {
       "customType": "regex",
       "description": "Auto-detect versioned jsDelivr / unpkg npm assets in HTML",
-      "fileMatch": ["\\.html$"],
+      "managerFilePatterns": ["/\\.html$/"],
       "matchStrings": [
         "https://cdn\\.jsdelivr\\.net/npm/(?<depName>@?[^@/]+(?:/[^@/]+)?)@(?<currentValue>\\d[^/\"']+)",
         "https://unpkg\\.com/(?<depName>@?[^@/]+(?:/[^@/]+)?)@(?<currentValue>\\d[^/\"']+)"

styles.css

@@ -21,14 +21,14 @@
 
 /* Original DLR — 1987 red, white and blue */
 [data-theme="original"] {
-  --bg: #f5f0e1;
+  --bg: #c8102e;
   --surface: #002b5c;
-  --text: #002b5c;
-  --message: #002b5c;
-  --button-bg: #c8102e;
+  --text: #f5f0e1;
+  --message: #f5f0e1;
+  --button-bg: #002b5c;
   --button-text: #f5f0e1;
-  --button-active-bg: #002b5c;
-  --button-active-text: #f5f0e1;
+  --button-active-bg: #f5f0e1;
+  --button-active-text: #002b5c;
 }
 
 * {