merge jobs into build-docker and try to use artifact name with image name in it to work around (409) Conflict: an artifact with this name already exists

Author: jordan-evens

.github/workflows/build-docker-image.yml

@@ -79,7 +79,7 @@ jobs:
       - name: Upload digest
         uses: actions/upload-artifact@v4
         with:
-          name: digests-${{ env.PLATFORM_PAIR }}
+          name: digests-${{ inputs.image }}-${{ env.PLATFORM_PAIR }}
           path: ${{ runner.temp }}/digests/*
           if-no-files-found: error
           retention-days: 1
@@ -97,7 +97,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           path: ${{ runner.temp }}/digests
-          pattern: digests-*
+          pattern: digests-${{ inputs.image }}-*
           merge-multiple: true
 
       - name: Login to GHCR

.github/workflows/build-docker-minimal.yml

@@ -1,24 +1,26 @@
 name: build-docker
 
 on:
-  workflow_run:
-    workflows: [build-docker-vcpkg-installed]
-    types:
-      - completed
+  push:
+    branches: [ "main", "dev", "unstable" ]
+    tags: [ "*" ]
+  workflow_dispatch:
 
 jobs:
-  on-success:
-    runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
-    steps:
-      - run: echo 'The triggering workflow passed'
+  # specifically package this so build process doesn't keep redoing it
+  build-docker-vcpkg-installed:
+    uses: ./.github/workflows/build-docker-image.yml
+    with:
+      image: vcpkg-installed
 
-      - uses: ./.github/workflows/build-docker-image.yml
-        with:
-          image: firestarr
+  build-docker-normal:
+    needs: [build-docker-vcpkg-installed]
+    uses: ./.github/workflows/build-docker-image.yml
+    with:
+      image: firestarr
 
-  on-failure:
-    runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'failure' }}
-    steps:
-      - run: echo 'The triggering workflow failed'
+  build-docker-minimal:
+    needs: [build-docker-normal]
+    uses: ./.github/workflows/build-docker-image.yml
+    with:
+      image: firestarr-minimal