fix: expose enable-edge-tag on reusable workflow (#1098)

* fix: expose enable-edge-tag on reusable workflow

* chore: fix coupling of input

Author: rjaegers

.github/workflows/continuous-integration.yml

@@ -25,6 +25,7 @@ jobs:
       pull-requests: write # is needed by marocchino/sticky-pull-request-comment to post comments
     with:
       dockerfile: .devcontainer/base/Dockerfile
+      enable-edge-tag: ${{ github.event_name == 'merge_group' }}
       image-name: ${{ github.repository }}-base
       integration-test-file: test/base/integration-tests.bats
 
@@ -52,6 +53,7 @@ jobs:
         BASE_IMAGE=${{ needs.build-push-base.outputs.fully-qualified-image-name }}@${{ needs.build-push-base.outputs.digest }}
       devcontainer-metadata-file: .devcontainer/${{ matrix.flavor }}/devcontainer-metadata.json
       dockerfile: .devcontainer/${{ matrix.flavor }}/Dockerfile
+      enable-edge-tag: ${{ github.event_name == 'merge_group' }}
       image-name: ${{ github.repository }}-${{ matrix.flavor }}
       integration-test-file: test/${{ matrix.flavor }}/integration-tests.bats
       acceptance-test-path: ${{ matrix.flavor == 'cpp' && 'test/cpp/features' || '' }}

.github/workflows/release-build.yml

@@ -26,6 +26,7 @@ jobs:
     with:
       dockerfile: .devcontainer/base/Dockerfile
       image-name: ${{ github.repository }}-base
+      integration-test-file: test/base/integration-tests.bats
 
   build-push-flavors:
     name: Build → Push → Test (🍨 ${{ matrix.flavor }})

.github/workflows/wc-build-push-test.yml

@@ -37,6 +37,11 @@ on:
         description: Path to the Dockerfile to build
         required: true
         type: string
+      enable-edge-tag:
+        description: Whether to also build and push an "edge" tag for the image
+        required: false
+        type: boolean
+        default: false
       image-name:
         description: >-
           Name of the Docker image to build, without registry or tag.
@@ -116,6 +121,7 @@ jobs:
     with:
       build-args: ${{ inputs.build-args }}
       dockerfile: ${{ inputs.dockerfile }}
+      enable-edge-tag: ${{ inputs.enable-edge-tag }}
       registry: ${{ inputs.registry }}
       image-name: ${{ inputs.image-name }}
       devcontainer-metadata-file: ${{ inputs.devcontainer-metadata-file }}

.github/workflows/wc-build-push.yml

@@ -26,6 +26,9 @@ on:
       dockerfile:
         required: true
         type: string
+      enable-edge-tag:
+        required: true
+        type: boolean
       image-name:
         required: true
         type: string
@@ -182,11 +185,8 @@ jobs:
         with:
           images: ${{ needs.sanitize-image-name.outputs.fully-qualified-image-name }}
           # Generate Docker tags based on the following events/attributes.
-          # To prevent unnecessary image builds we simulate the `type=edge` tag
-          # with `type=raw,value=edge,enable=...` which only enables the tag
-          # for a `merge_group` event, this removes the need to build on `push`.
           tags: |
-            type=raw,value=edge,enable=${{ github.event_name == 'merge_group' }}
+            type=raw,value=edge,enable=${{ inputs.enable-edge-tag }}
             type=ref,event=pr
             type=semver,pattern={{raw}}
             type=semver,pattern={{version}}