fix(ci): resolve build-image.yml merge conflict from main
test-image / build-image (pull_request) Successful in 44s
test / test (pull_request) Successful in 1m19s
build-binaries / build-binaries (pull_request) Successful in 1m58s

The `Merge branch 'main'` commit (088cbf3) landed build-image.yml with
unresolved conflict markers. Resolved to main's "Release workflow
revision" design: build-image.yml now triggers on `v*` tags only and
always publishes, because test-image.yml owns the PR/main test builds
and never publishes. Keeping the old PR/main triggers here would have
double-built and is now redundant.

Verified: go vet, go test ./..., shellcheck, yamllint, make smoke all pass.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
2026-06-16 15:38:41 +02:00
co-authored by Claude Opus 4.8
parent 088cbf36fc
commit 9f94480e4e
+1 -29
View File
@@ -1,14 +1,6 @@
<<<<<<< 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. # Publish the immutable crucible:<sha> image on version tags.
# PR/main test builds live in test-image.yml and never publish, so registry # 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). # 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 # 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 # built by Nix (`nix build .#image`, see flake.nix) and pushed with skopeo
@@ -16,17 +8,8 @@
name: build-image name: build-image
on: on:
pull_request:
push: push:
<<<<<<< HEAD
branches: [main]
tags: ['v*'] tags: ['v*']
||||||| f3211f0
branches: [main]
pull_request:
=======
tags: ["v*"]
>>>>>>> main
env: env:
REGISTRY: registry.westgate.pw REGISTRY: registry.westgate.pw
@@ -46,19 +29,8 @@ jobs:
- name: Build OCI image (daemonless) - name: Build OCI image (daemonless)
run: nix build .#image run: nix build .#image
<<<<<<< HEAD # This workflow only runs on v* tags, so every run is a release publish.
# 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 - 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: env:
REGISTRY_USER: ${{ secrets.REGISTRY_USER }} REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }} REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}