18 Commits

Author SHA1 Message Date
lyrathorpe c5433a23ee 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
2026-06-12 12:42:29 +01:00
Emma Thorpe fb705c234f ci: filter main builds to code changes and cancel superseded runs
Build and publish container / build (pull_request) Successful in 1m35s
Apply path filters to the push (merge-to-main) trigger only, so merges that
do not change the image (CI/Renovate config, docs) skip the build and release.
Pull requests keep running unfiltered so the required check is always reported.

Add a concurrency group keyed by ref with cancel-in-progress, so a newer run
supersedes an older in-flight run: a fresh merge to main cancels the previous
build and only the most recent release is produced, avoiding tags that would
be immediately replaced.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-12 12:39:56 +01:00
lyrathorpe 562ce29ca1 Merge pull request 'fix(deps): update docker/setup-qemu-action action to v4' (#17) from renovate/docker-setup-qemu-action-4.x into main
Build and publish container / build (push) Failing after 5m57s
Reviewed-on: #17
2026-06-12 12:26:35 +01:00
lyrathorpe 1c57d70c00 Merge pull request 'fix(deps): update docker/setup-buildx-action action to v4' (#16) from renovate/docker-setup-buildx-action-4.x into main
Build and publish container / build (push) Failing after 6m6s
Reviewed-on: #16
2026-06-12 12:26:05 +01:00
lyrathorpe 7e23b09694 Merge pull request 'fix(deps): update docker/login-action action to v4' (#11) from renovate/docker-login-action-4.x into main
Build and publish container / build (push) Failing after 8m16s
Reviewed-on: #11
2026-06-12 12:21:38 +01:00
lyrathorpe 818331b066 Merge pull request 'fix(deps): update docker/build-push-action action to v7' (#10) from renovate/docker-build-push-action-7.x into main
Build and publish container / build (push) Failing after 34s
Reviewed-on: #10
2026-06-12 12:21:38 +01:00
lyrathorpe dfedc5c51b Merge pull request 'fix(deps): update actions/checkout action to v6' (#9) from renovate/actions-checkout-6.x into main
Build and publish container / build (push) Successful in 8m35s
Reviewed-on: #9
2026-06-12 12:18:49 +01:00
Renovate Bot 0c38161989 fix(deps): update docker/setup-qemu-action action to v4
Build and publish container / build (pull_request) Successful in 7m37s
2026-06-12 11:11:04 +00:00
Renovate Bot d97707387d fix(deps): update docker/setup-buildx-action action to v4
Build and publish container / build (pull_request) Successful in 7m33s
2026-06-12 11:11:00 +00:00
Renovate Bot b26d49d9d8 fix(deps): update docker/login-action action to v4
Build and publish container / build (pull_request) Successful in 7m27s
2026-06-12 11:10:57 +00:00
Renovate Bot 9e5958b458 fix(deps): update docker/build-push-action action to v7
Build and publish container / build (pull_request) Successful in 7m28s
2026-06-12 11:10:53 +00:00
Renovate Bot df0df3e9a0 fix(deps): update actions/checkout action to v6
Build and publish container / build (pull_request) Successful in 7m20s
2026-06-12 11:10:48 +00:00
lyrathorpe 8bb782287e Merge pull request 'fix(deps): pin dependencies' (#7) from renovate/pin-dependencies into main
Build and publish container / build (push) Successful in 9m52s
Reviewed-on: #7
2026-06-12 12:08:23 +01:00
Renovate Bot 56ec85c17e fix(deps): pin dependencies
Build and publish container / build (pull_request) Successful in 7m56s
2026-06-12 10:58:16 +00:00
lyrathorpe 9412c20248 Merge pull request 'Fix/renovate semantic fix' (#14) from fix/renovate-semantic-fix into main
Build and publish container / build (push) Has been cancelled
Reviewed-on: #14
2026-06-12 11:49:53 +01:00
Emma Thorpe 564070b270 ci: auto-merge patch and minor renovate updates
Build and publish container / build (pull_request) Successful in 4m55s
Add a packageRule that automerges patch and minor updates, with
platformAutomerge enabled so Gitea merges them once required checks pass.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-12 11:39:02 +01:00
Emma Thorpe 22c2ef1b26 fix: force fix(deps) commit type so renovate PRs trigger releases
Build and publish container / build (pull_request) Successful in 6m16s
config:recommended pulls in :semanticPrefixFixDepsChoreOthers, whose catch-all
packageRule forces non-npm updates (Docker base image, Gitea Actions) to the
chore type, overriding the top-level semanticCommitType. chore produces no
release, so Renovate updates were never auto-tagged.

Append a packageRule matching all packages that sets semanticCommitType to fix,
so every merged Renovate PR registers as a patch and is released and tagged.
Also migrate the deprecated fileMatch keys to managerFilePatterns.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-12 11:31:07 +01:00
Emma Thorpe 301120c174 fix: recolour original theme to a red field with white text
Switch the original theme to a red background with white message text, with
navy buttons, evoking the red B07/B99 stock. Red/white/blue are all retained.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-12 11:24:30 +01:00
3 changed files with 45 additions and 14 deletions
+25 -5
View File
@@ -1,10 +1,30 @@
name: Build and publish container name: Build and publish container
on: 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: push:
branches: [main] 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: pull_request:
branches: [main] 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: defaults:
run: run:
@@ -18,7 +38,7 @@ jobs:
packages: write packages: write
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v4 uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
with: with:
# Full history and tags are required to derive the next version # Full history and tags are required to derive the next version
# from the conventional-commit messages since the last release. # from the conventional-commit messages since the last release.
@@ -94,21 +114,21 @@ jobs:
echo "Computed bump=${bump}, release=${release}, base=${base}" echo "Computed bump=${bump}, release=${release}, base=${base}"
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@v3 uses: docker/setup-qemu-action@06116385d9baf250c9f4dcb4858b16962ea869c3 # v4
- name: Set up Buildx - 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 - name: Log in to the Gitea container registry
if: github.event_name != 'pull_request' if: github.event_name != 'pull_request'
uses: docker/login-action@v3 uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
with: with:
registry: ${{ env.REGISTRY }} registry: ${{ env.REGISTRY }}
username: ${{ github.repository_owner }} username: ${{ github.repository_owner }}
password: ${{ secrets.PACKAGES_TOKEN }} password: ${{ secrets.PACKAGES_TOKEN }}
- name: Build and push - name: Build and push
uses: docker/build-push-action@v6 uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7
with: with:
context: . context: .
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64
+14 -3
View File
@@ -10,20 +10,31 @@
"semanticCommitType": "fix", "semanticCommitType": "fix",
"semanticCommitScope": "deps", "semanticCommitScope": "deps",
"github-actions": { "github-actions": {
"fileMatch": ["^\\.gitea/workflows/[^/]+\\.ya?ml$"] "managerFilePatterns": ["/^\\.gitea/workflows/[^/]+\\.ya?ml$/"]
}, },
"packageRules": [ "packageRules": [
{ {
"description": "Group nginx base image updates", "description": "Group nginx base image updates",
"matchManagers": ["dockerfile"], "matchManagers": ["dockerfile"],
"groupName": "docker base image" "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": [ "customManagers": [
{ {
"customType": "regex", "customType": "regex",
"description": "Update HTML dependencies annotated with a renovate comment, e.g. <!-- renovate: datasource=npm depName=bootstrap --> before the versioned URL", "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": [ "matchStrings": [
"datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)( versioning=(?<versioning>\\S+))?[\\s\\S]*?(?<currentValue>v?\\d+\\.\\d+\\.\\d+[\\w.-]*)" "datasource=(?<datasource>\\S+) depName=(?<depName>\\S+)( versioning=(?<versioning>\\S+))?[\\s\\S]*?(?<currentValue>v?\\d+\\.\\d+\\.\\d+[\\w.-]*)"
] ]
@@ -31,7 +42,7 @@
{ {
"customType": "regex", "customType": "regex",
"description": "Auto-detect versioned jsDelivr / unpkg npm assets in HTML", "description": "Auto-detect versioned jsDelivr / unpkg npm assets in HTML",
"fileMatch": ["\\.html$"], "managerFilePatterns": ["/\\.html$/"],
"matchStrings": [ "matchStrings": [
"https://cdn\\.jsdelivr\\.net/npm/(?<depName>@?[^@/]+(?:/[^@/]+)?)@(?<currentValue>\\d[^/\"']+)", "https://cdn\\.jsdelivr\\.net/npm/(?<depName>@?[^@/]+(?:/[^@/]+)?)@(?<currentValue>\\d[^/\"']+)",
"https://unpkg\\.com/(?<depName>@?[^@/]+(?:/[^@/]+)?)@(?<currentValue>\\d[^/\"']+)" "https://unpkg\\.com/(?<depName>@?[^@/]+(?:/[^@/]+)?)@(?<currentValue>\\d[^/\"']+)"
+6 -6
View File
@@ -21,14 +21,14 @@
/* Original DLR — 1987 red, white and blue */ /* Original DLR — 1987 red, white and blue */
[data-theme="original"] { [data-theme="original"] {
--bg: #f5f0e1; --bg: #c8102e;
--surface: #002b5c; --surface: #002b5c;
--text: #002b5c; --text: #f5f0e1;
--message: #002b5c; --message: #f5f0e1;
--button-bg: #c8102e; --button-bg: #002b5c;
--button-text: #f5f0e1; --button-text: #f5f0e1;
--button-active-bg: #002b5c; --button-active-bg: #f5f0e1;
--button-active-text: #f5f0e1; --button-active-text: #002b5c;
} }
* { * {