From deada6cbd9c4fd380aeae0dd867eea45734ba991 Mon Sep 17 00:00:00 2001
From: Jesse Wierzbinski <contact@cpluspatch.com>
Date: Tue, 31 Dec 2024 17:21:49 +0100
Subject: [PATCH] ci: :recycle: Merge Worker & Server build into one CI file

---
 .github/workflows/docker-worker.yml           | 79 -------------------
 .../{docker-server.yml => docker.yml}         | 27 ++++---
 2 files changed, 15 insertions(+), 91 deletions(-)
 delete mode 100644 .github/workflows/docker-worker.yml
 rename .github/workflows/{docker-server.yml => docker.yml} (77%)

diff --git a/.github/workflows/docker-worker.yml b/.github/workflows/docker-worker.yml
deleted file mode 100644
index 36ee466a..00000000
--- a/.github/workflows/docker-worker.yml
+++ /dev/null
@@ -1,79 +0,0 @@
-name: Build Worker Docker Image
-
-on:
-    push:
-        branches: ["main"]
-        # Publish semver tags as releases.
-        tags: ["v*.*.*"]
-    pull_request:
-        branches: ["main"]
-
-env:
-    # Use docker.io for Docker Hub if empty
-    REGISTRY: ghcr.io
-    # github.repository as <account>/<repo>
-    IMAGE_NAME: ${{ github.repository_owner }}/worker
-
-jobs:
-    build:
-        runs-on: ubuntu-latest
-        permissions:
-            contents: read
-            packages: write
-            # This is used to complete the identity challenge
-            # with sigstore/fulcio when running outside of PRs.
-            id-token: write
-
-        steps:
-            - name: Checkout repository
-              uses: actions/checkout@v4
-              with:
-                  submodules: recursive
-
-            - name: Setup QEMU
-              uses: docker/setup-qemu-action@v3
-              with:
-                  platforms: all
-
-            - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@v3 # v3.0.0
-
-            - name: Log into registry ${{ env.REGISTRY }}
-              if: github.event_name != 'pull_request'
-              uses: docker/login-action@v3 # v3.0.0
-              with:
-                  registry: ${{ env.REGISTRY }}
-                  username: ${{ github.actor }}
-                  password: ${{ secrets.GITHUB_TOKEN }}
-
-            - name: Extract Docker metadata
-              id: meta
-              uses: docker/metadata-action@v5 # v5.0.0
-              with:
-                  images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-                  tags: |
-                      type=schedule
-                      type=ref,event=branch
-                      type=ref,event=tag
-                      type=ref,event=pr
-                      type=sha
-
-            - name: Get the commit hash
-              run: echo "GIT_COMMIT=$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_ENV
-
-            - name: Build and push Docker image
-              id: build-and-push
-              uses: docker/build-push-action@v5 # v5.0.0
-              with:
-                  context: .
-                  push: ${{ github.event_name != 'pull_request' }}
-                  tags: ${{ steps.meta.outputs.tags }}
-                  labels: ${{ steps.meta.outputs.labels }}
-                  build-args: |
-                      GIT_COMMIT=${{ env.GIT_COMMIT }}
-                  file: ./Worker.Dockerfile
-                  provenance: mode=max
-                  sbom: true
-                  platforms: linux/amd64,linux/arm64
-                  cache-from: type=gha
-                  cache-to: type=gha,mode=max
diff --git a/.github/workflows/docker-server.yml b/.github/workflows/docker.yml
similarity index 77%
rename from .github/workflows/docker-server.yml
rename to .github/workflows/docker.yml
index 3325fc8d..85bd9105 100644
--- a/.github/workflows/docker-server.yml
+++ b/.github/workflows/docker.yml
@@ -1,4 +1,4 @@
-name: Build Server Docker Image
+name: Build Docker Images
 
 on:
     push:
@@ -8,12 +8,6 @@ on:
     pull_request:
         branches: ["main"]
 
-env:
-    # Use docker.io for Docker Hub if empty
-    REGISTRY: ghcr.io
-    # github.repository as <account>/<repo>
-    IMAGE_NAME: ${{ github.repository }}
-
 jobs:
     build:
         runs-on: ubuntu-latest
@@ -23,6 +17,15 @@ jobs:
             # This is used to complete the identity challenge
             # with sigstore/fulcio when running outside of PRs.
             id-token: write
+        strategy:
+            matrix:
+                include:
+                    - container: worker
+                      image_name: ${{ github.repository_owner }}/worker
+                    - container: server
+                      image_name: ${{ github.repository_owner }}/server
+        env:
+            REGISTRY: ghcr.io
 
         steps:
             - name: Checkout repository
@@ -36,11 +39,11 @@ jobs:
                   platforms: all
 
             - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@v3 # v3.0.0
+              uses: docker/setup-buildx-action@v3
 
             - name: Log into registry ${{ env.REGISTRY }}
               if: github.event_name != 'pull_request'
-              uses: docker/login-action@v3 # v3.0.0
+              uses: docker/login-action@v3
               with:
                   registry: ${{ env.REGISTRY }}
                   username: ${{ github.actor }}
@@ -48,9 +51,9 @@ jobs:
 
             - name: Extract Docker metadata
               id: meta
-              uses: docker/metadata-action@v5 # v5.0.0
+              uses: docker/metadata-action@v5
               with:
-                  images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+                  images: ${{ env.REGISTRY }}/${{ matrix.image_name }}
                   tags: |
                       type=schedule
                       type=ref,event=branch
@@ -63,7 +66,7 @@ jobs:
 
             - name: Build and push Docker image
               id: build-and-push
-              uses: docker/build-push-action@v5 # v5.0.0
+              uses: docker/build-push-action@v5
               with:
                   context: .
                   push: ${{ github.event_name != 'pull_request' }}