Merge branch 'main' into feat/crucible-cross-platform

.gitea/workflows/build-image.yml

@@ -1,5 +1,14 @@
+<<<<<<< HEAD
 # Build the Crucible image (D7 trigger standard): PRs/main build only; tag `v*`
 # publishes registry.westgate.pw/deployment/crucible:<sha>. Never a mutable tag.
+||||||| f3211f0
+# Build the Crucible image. PR-first (D7): PRs build only; push to main also
+# publishes registry.westgate.pw/deployment/crucible:<git-sha>. Never a mutable tag.
+=======
+# Publish the immutable crucible:<sha> image on version tags.
+# PR/main test builds live in test-image.yml and never publish, so registry
+# packages are only generated for releases we intend to use (not on every merge).
+>>>>>>> main
 #
 # Daemonless: the host-mode runner has no container runtime, so the image is
 # built by Nix (`nix build .#image`, see flake.nix) and pushed with skopeo
@@ -9,15 +18,22 @@ name: build-image
 on:
   pull_request:
   push:
+<<<<<<< HEAD
     branches: [main]
     tags: ['v*']
+||||||| f3211f0
+    branches: [main]
+  pull_request:
+=======
+    tags: ["v*"]
+>>>>>>> main
 
 env:
   REGISTRY: registry.westgate.pw
   IMAGE: deployment/crucible
 
 jobs:
-  build-image:
+  publish:
     runs-on: nix-docker
     steps:
       - uses: actions/checkout@v4
@@ -30,9 +46,19 @@ jobs:
       - name: Build OCI image (daemonless)
         run: nix build .#image
 
+<<<<<<< HEAD
       # Publish only on a v* tag push. PRs and main pushes build but never push.
+||||||| f3211f0
+      # Publish only on main (post-merge). PRs verify the build but never push.
+=======
+>>>>>>> main
       - name: Publish image
+<<<<<<< HEAD
         if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
+||||||| f3211f0
+        if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+=======
+>>>>>>> main
         env:
           REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
           REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}