ci: testing new flows with layers caching & upgraded build graph

Author: maxskorr

.github/workflows/docker-publish.yml

@@ -1,9 +1,19 @@
 name: Build and Publish Docker image to GHCR
 
 on:
-  push:
-    tags: ["v*.*.*"]
   workflow_dispatch:
+    inputs:
+      version:
+        description: "Version string to tag Docker image with when manually dispatched (e.g., 0.9.2)"
+        required: false
+        default: "0.0.0-dev"
+  workflow_call:
+    inputs:
+      version:
+        description: "Version string to tag Docker image with when called from another workflow"
+        type: string
+        required: false
+        default: "0.0.0-dev"
 
 jobs:
   build-and-push:
@@ -30,6 +40,17 @@ jobs:
         id: repo_owner
         run: echo "lowercase=$(echo ${GITHUB_REPOSITORY_OWNER} | tr '[:upper:]' '[:lower:]')" >> "$GITHUB_OUTPUT"
 
+      # Determine release version for tagging
+      - name: Extract release version
+        id: vars
+        run: |
+          TAG="${GITHUB_REF#refs/tags/v}"
+          if [[ "$TAG" != "$GITHUB_REF" && "$TAG" != "" ]]; then
+            echo "version=$TAG" >> "$GITHUB_OUTPUT"
+          else
+            echo "version=${{ github.event.inputs.version }}" >> "$GITHUB_OUTPUT"
+          fi
+
       # Log in to GitHub Container Registry using the auto-generated token
       - name: Log in to GHCR
         uses: docker/login-action@v3
@@ -44,16 +65,22 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: ghcr.io/${{ steps.repo_owner.outputs.lowercase }}/wireport
+          tags: |
+            type=semver,pattern={{version}},value=${{ steps.vars.outputs.version }}
+            type=semver,pattern={{major}}.{{minor}},value=${{ steps.vars.outputs.version }}
+            type=semver,pattern={{major}},value=${{ steps.vars.outputs.version }}
 
       # Build and push the image defined in wireport/Dockerfile
-      - name: Build and push Docker image
+      - name: Build & push (inline cache)
         uses: docker/build-push-action@v5
         with:
-          context: ./
+          context: .
           file: ./Dockerfile
           push: true
           platforms: linux/amd64,linux/arm64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=registry,ref=ghcr.io/${{ steps.repo_owner.outputs.lowercase }}/wireport:buildcache
-          cache-to: type=registry,ref=ghcr.io/${{ steps.repo_owner.outputs.lowercase }}/wireport:buildcache,mode=max
+          cache-to:   type=registry,ref=ghcr.io/${{ steps.repo_owner.outputs.lowercase }}/wireport:buildcache,mode=max
+          build-args: |
+            BUILDKIT_INLINE_CACHE=1

.github/workflows/release-packages.yml

@@ -15,6 +15,17 @@ on:
         default: "false"
 
 jobs:
+  #-------------------------------------------------------------------
+  # Job: docker-publish
+  #   • Builds and pushes Docker image via reusable workflow
+  #-------------------------------------------------------------------
+  docker-publish:
+    name: Build & Publish Docker image
+    uses: ./.github/workflows/docker-publish.yml
+    with:
+      version: ${{ inputs.version }}
+    secrets: inherit
+
   #-------------------------------------------------------------------
   # Job: linux-build
   #   • Runs on Ubuntu
@@ -124,7 +135,7 @@ jobs:
   publish:
     name: Publish GitHub Release
     runs-on: ubuntu-latest
-    needs: [linux-build, macos-build]
+    needs: [linux-build, macos-build, docker-publish]
     if: github.event_name == 'push' || inputs.publish_release == 'true'
 
     permissions:

app/Makefile

@@ -1,4 +1,6 @@
-VERSION ?= 0.9.1
+VERSION ?= $(shell \
+	tag=$$(git describe --abbrev=0 --tags 2>/dev/null || echo v0.0.0); \
+	echo $${tag}-dev)
 COMMIT ?= $(shell git rev-parse --short HEAD 2>/dev/null || echo "unknown")
 DATE ?= $(shell date -u +%Y-%m-%dT%H:%M:%SZ)
 OUT_PATH ?= dist