test

Author: swick

.github/workflows/build-and-test.yml

@@ -4,7 +4,7 @@ env:
 on:
   workflow_call:
     inputs:
-      image:
+      images:
         required: true
         type: string
       image_options:
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: ${{ inputs.image }}-ubuntu-latest
+      image: ${{ fromJSON(inputs.images).ubuntu-latest }}
       env:
         CFLAGS: -O2 -Wp,-D_FORTIFY_SOURCE=2
         LC_ALL: en_US.UTF-8
@@ -80,7 +80,7 @@ jobs:
         compiler: ['gcc', 'clang']
 
     container:
-      image: ${{ inputs.image }}-${{ matrix.image }}
+      image: ${{ fromJSON(inputs.images)[matrix.image] }}
       env:
         CFLAGS: -O2 -Wp,-D_FORTIFY_SOURCE=2
         CC: ${{ matrix.compiler }}

.github/workflows/container.yml

@@ -1,12 +1,9 @@
-env:
-  IMAGE_TAG: 2025-11-21.9
-
 on:
   workflow_call:
     outputs:
-      image:
-        description: "The build image"
-        value: ${{ jobs.build-container.outputs.image }}
+      images:
+        description: "The build images"
+        value: ${{ jobs.collect.outputs.outcomes }}
       image_options:
         description: "The options to use with the image"
         value: --device /dev/fuse --cap-add SYS_ADMIN --security-opt apparmor:unconfined --privileged
@@ -17,10 +14,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        image: ['ubuntu-latest', 'fedora-latest']
-
-    outputs:
-      image: ${{ steps.check.outputs.image }}
+        image:
+         - 'ubuntu-latest:2025-11-21.9'
+         - 'fedora-latest:2025-11-21.10'
 
     steps:
       - name: Login to GHCR
@@ -35,16 +31,22 @@ jobs:
         run: |
           ACTOR="${{ github.actor }}"
           OWNER="${{ github.repository_owner }}"
-          image_actor="ghcr.io/${ACTOR,,}/flatpak-ci:${{ env.IMAGE_TAG }}"
-          image_owner="ghcr.io/${OWNER,,}/flatpak-ci:${{ env.IMAGE_TAG }}"
 
-          if docker manifest inspect "${image_owner}-${{ matrix.image }}" >/dev/null ; then
+          image_name=$(echo "${{ matrix.image }}" | cut -d':' -f1)
+          image="flatpak-ci-${{ matrix.image }}"
+
+          echo "image_name=${image_name}" >> "$GITHUB_OUTPUT"
+
+          image_owner="ghcr.io/${OWNER,,}/${image}"
+          image_actor="ghcr.io/${ACTOR,,}/${image}"
+
+          if docker manifest inspect "${image_owner}" >/dev/null ; then
             echo "exists=true" >> "$GITHUB_OUTPUT"
             echo "image=${image_owner}" >> "$GITHUB_OUTPUT"
             exit 0
           fi
 
-          if docker manifest inspect "${image_actor}-${{ matrix.image }}" >/dev/null ; then
+          if docker manifest inspect "${image_actor}" >/dev/null ; then
             echo "exists=true" >> "$GITHUB_OUTPUT"
             echo "image=${image_actor}" >> "$GITHUB_OUTPUT"
             exit 0
@@ -58,5 +60,34 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           push: true
-          file: .github/workflows/containers/${{ matrix.image }}.containerfile
-          tags: ${{ steps.check.outputs.image }}-${{ matrix.image }}
+          file: .github/workflows/containers/${{ steps.check.outputs.image_name }}.containerfile
+          tags: ${{ steps.check.outputs.image }}
+
+      - name: Record the result
+        run: |
+          jq -cn \
+            --arg name "${{ steps.check.outputs.image_name }}" \
+            --arg image "${{ steps.check.outputs.image }}" \
+            '$ARGS.named' > outcome
+
+      - name: Upload the result
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ hashFiles('outcome') }}
+          path: outcome
+
+  collect:
+    name: Collect build container results
+    runs-on: ubuntu-latest
+    needs: build-container
+    if: ${{ !cancelled() }}
+    outputs:
+      outcomes: ${{ steps.collect.outputs.outcomes }}
+
+    steps:
+      - uses: actions/download-artifact@v4
+      - id: collect
+        run: |
+          outcomes="$(cat */outcome | jq -c --slurp 'map({(.name): .image})')"
+          echo $outcomes
+          echo outcomes=$outcomes >> $GITHUB_OUTPUT

.github/workflows/main.yml

@@ -14,7 +14,7 @@ jobs:
     uses: ./.github/workflows/build-and-test.yml
     needs: build-container
     with:
-      image: ${{ needs.build-container.outputs.image }}
+      images: ${{ needs.build-container.outputs.images }}
       image_options: ${{ needs.build-container.outputs.image_options }}
 
   checks: