Simplify container tagging: one tag triggers all workflows

Both the Dockerfile and Nix workflows now trigger on the same tag
pattern (*-v[0-9]*). Each workflow checks for its build file and
skips if not present. This eliminates the need for separate -nix-
tags and --nix/--dockerfile flags in the release script.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

.forgejo/workflows/build-container-nix.yaml

@@ -1,17 +1,17 @@
 # Nix container build workflow
-# Triggers on tags matching: <container>-nix-v<version>
-# Builds from containers/<container>/default.nix using nix build
-# Pushes to Zot registry via skopeo
+# Triggers on tags matching: <container>-v<version>
+# Builds from containers/<container>/default.nix if it exists, skips otherwise
+# Pushes to Zot registry via skopeo with -nix image tag suffix
 #
 # Examples:
-#   nettest-nix-v1.0.0  -> builds containers/nettest/default.nix, pushes :v1.0.0-nix
-#   myapp-nix-v2.1.0    -> builds containers/myapp/default.nix, pushes :v2.1.0-nix
+#   nettest-v1.0.0  -> builds containers/nettest/default.nix, pushes :v1.0.0-nix
+#   devpi-v2.1.0    -> skips (no default.nix)
 name: Build Container (Nix)
 
 on:
   push:
     tags:
-      - '*-nix-v[0-9]*'
+      - '*-v[0-9]*'
 
 jobs:
   build:
@@ -23,10 +23,10 @@ jobs:
           TAG="${GITHUB_REF_NAME}"
           echo "Tag: $TAG"
 
-          # Extract container name (everything before -nix-v)
-          # e.g., "nettest-nix-v1.0.0" -> "nettest"
-          CONTAINER="${TAG%-nix-v[0-9]*}"
-          VERSION="${TAG#"${CONTAINER}"-nix-}"
+          # Extract container name (everything before -v)
+          # e.g., "nettest-v1.0.0" -> "nettest", "my-app-v2.0.0" -> "my-app"
+          CONTAINER="${TAG%-v[0-9]*}"
+          VERSION="${TAG#"${CONTAINER}"-}"
 
           echo "container=$CONTAINER" >> "$GITHUB_OUTPUT"
           echo "version=$VERSION" >> "$GITHUB_OUTPUT"
@@ -46,26 +46,10 @@ jobs:
             echo "Found $CONTEXT/default.nix"
             echo "exists=true" >> "$GITHUB_OUTPUT"
           else
-            echo "No default.nix found at $CONTEXT/default.nix"
+            echo "No default.nix found at $CONTEXT/default.nix — skipping"
             echo "exists=false" >> "$GITHUB_OUTPUT"
           fi
 
-      - name: Skip if container not found
-        if: steps.check.outputs.exists != 'true'
-        run: |
-          echo "========================================"
-          echo "Nix container not found: ${{ steps.parse.outputs.container }}"
-          echo "========================================"
-          echo ""
-          echo "Tag '${{ github.ref_name }}' does not match any nix container in containers/"
-          echo ""
-          echo "Available nix containers:"
-          for nix in containers/*/default.nix; do
-            [ -f "$nix" ] && echo "  - $(basename "$(dirname "$nix")")"
-          done
-          echo ""
-          echo "Skipping build."
-
       - name: Resolve nixpkgs
         if: steps.check.outputs.exists == 'true'
         id: nixpkgs

.forgejo/workflows/build-container.yaml

@@ -17,7 +17,6 @@ on:
 
 jobs:
   build:
-    if: "!contains(github.ref_name, '-nix-v')"
     runs-on: k8s
     steps:
       - name: Parse tag

mise-tasks/container-list

@@ -52,10 +52,10 @@ for dir in "$CONTAINER_DIR"/*/; do
 done
 
 echo "---"
-echo "To release a new version (builds all available types by default):"
+echo "To release a new version:"
 echo "  mise run container-tag-and-release <container> <version>"
-echo "  mise run container-tag-and-release <container> <version> --nix        # nix only"
-echo "  mise run container-tag-and-release <container> <version> --dockerfile # dockerfile only"
+echo ""
+echo "One tag triggers all applicable workflows (dockerfile and/or nix)."
 echo ""
 echo "Example:"
 echo "  mise run container-tag-and-release nettest v1.0.0"

mise-tasks/container-tag-and-release

@@ -6,17 +6,12 @@
 #MISE description="Release a container image by creating a git tag"
 #USAGE arg "<container>" help="Container name (directory under containers/)"
 #USAGE arg "<version>" help="Version in vX.Y.Z format"
-#USAGE flag "--nix" help="Release only the nix variant"
-#USAGE flag "--dockerfile" help="Release only the dockerfile variant"
 #USAGE flag "--dry-run" help="Show what would be done without creating tags"
-"""Release a container image by creating git tag(s) that trigger CI builds.
+"""Release a container image by creating a git tag that triggers CI builds.
 
-When a container has both a Dockerfile and default.nix, both tags are created
-by default. Use --nix or --dockerfile to release only one variant.
-
-Tag conventions:
-  <container>-v<version>       -> build-container.yaml  -> :v<version>
-  <container>-nix-v<version>   -> build-container-nix.yaml -> :v<version>-nix
+One tag triggers all applicable workflows:
+  - Dockerfile present -> Build Container workflow  -> :v<version>
+  - default.nix present -> Build Container (Nix) workflow -> :v<version>-nix
 """
 
 import re
@@ -60,33 +55,13 @@ def list_containers() -> None:
             typer.echo(f"  - {d.name} ({', '.join(types)})")
 
 
-def create_and_push_tag(tag: str, image: str, image_tag: str, dry_run: bool) -> bool:
-    """Create a git tag and push it. Returns True on success."""
-    if git_tag_exists(tag):
-        typer.echo(f"  Skip: Tag '{tag}' already exists")
-        return False
-    if dry_run:
-        typer.echo(f"  [dry-run] Would create and push: {tag}  ->  {REGISTRY}/{image}:{image_tag}")
-    else:
-        git("tag", tag)
-        git("push", "origin", tag)
-        typer.echo(f"  {tag}  ->  {REGISTRY}/{image}:{image_tag}")
-    return True
-
-
 @app.command()
 def main(
     container: str = typer.Argument(help="Container name (directory under containers/)"),
     version: str = typer.Argument(help="Version in vX.Y.Z format"),
-    nix: bool = typer.Option(False, "--nix", help="Release only the nix variant"),
-    dockerfile: bool = typer.Option(False, "--dockerfile", help="Release only the dockerfile variant"),
     dry_run: bool = typer.Option(False, "--dry-run", help="Show what would be done without creating tags"),
 ) -> None:
-    """Release a container image by creating git tag(s) that trigger CI builds."""
-    if nix and dockerfile:
-        typer.echo("Error: --nix and --dockerfile are mutually exclusive")
-        raise typer.Exit(1)
-
+    """Release a container image by creating a git tag that triggers CI builds."""
     if not re.match(r"^v\d+\.\d+\.\d+$", version):
         typer.echo("Error: Version must be in format vX.Y.Z (e.g. v1.0.0)")
         raise typer.Exit(1)
@@ -101,52 +76,36 @@ def main(
         list_containers()
         raise typer.Exit(1)
 
-    if nix and not has_nix:
-        typer.echo(f"Error: --nix specified but no default.nix in '{container_dir}'")
-        raise typer.Exit(1)
-    if dockerfile and not has_dockerfile:
-        typer.echo(f"Error: --dockerfile specified but no Dockerfile in '{container_dir}'")
-        raise typer.Exit(1)
-
-    # Decide which builds to release
-    builds: list[str] = []
-    if nix:
-        builds = ["nix"]
-    elif dockerfile:
-        builds = ["dockerfile"]
-    else:
-        if has_dockerfile:
-            builds.append("dockerfile")
-        if has_nix:
-            builds.append("nix")
-
     image = f"blumeops/{container}"
+    tag = f"{container}-{version}"
+
+    # Show what workflows will trigger
+    builds = []
+    if has_dockerfile:
+        builds.append(f"  dockerfile -> {REGISTRY}/{image}:{version}")
+    if has_nix:
+        builds.append(f"  nix        -> {REGISTRY}/{image}:{version}-nix")
 
     if dry_run:
         typer.echo("[dry-run mode]")
     typer.echo(f"Container: {container}")
-    typer.echo(f"Image:     {REGISTRY}/{image}")
-    typer.echo(f"Version:   {version}")
-    typer.echo(f"Builds:    {', '.join(builds)}")
+    typer.echo(f"Tag:       {tag}")
+    typer.echo(f"Builds:")
+    for b in builds:
+        typer.echo(b)
     typer.echo()
 
-    # Create and push tags
-    tags_created = 0
-    for build in builds:
-        if build == "nix":
-            tag = f"{container}-nix-{version}"
-            image_tag = f"{version}-nix"
-        else:
-            tag = f"{container}-{version}"
-            image_tag = version
-        if create_and_push_tag(tag, image, image_tag, dry_run):
-            tags_created += 1
-
-    if tags_created == 0:
-        typer.echo()
-        typer.echo("No tags created (all already existed)")
+    if git_tag_exists(tag):
+        typer.echo(f"Error: Tag '{tag}' already exists")
         raise typer.Exit(1)
 
+    if dry_run:
+        typer.echo(f"[dry-run] Would create and push tag: {tag}")
+    else:
+        git("tag", tag)
+        git("push", "origin", tag)
+        typer.echo(f"Tag '{tag}' created and pushed")
+
     typer.echo()
     typer.echo(f"Monitor builds at: {FORGE_ACTIONS}")