Use separate multi-arch and multi-platform workflow jobs

redhat-actions · Oct 11, 2021 · 7b92604 · 7b92604
1 parent 40d5a43
commit 7b92604
Showing 1 changed file with 70 additions and 29 deletions.
diff --git a/.github/workflows/multiarch.yml b/.github/workflows/multiarch.yml
@@ -11,15 +11,14 @@ env:
   IMAGE_TAG: latest
 
 jobs:
-  build:
-    name: Build image using Buildah
+  build-multiarch:
+    name: Build multi-architecture image using Buildah
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
         arch: [ amd64, i386, arm64v8 ]
         install_latest: [ true, false ]
-        specify_platform: [ false, true ]
 
     steps:
 
@@ -39,8 +38,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y qemu-user-static
 
-      - name: Create Containerfile (arch=${{ matrix.arch }})
-        if: !matrix.specify_platform
+      - name: Create Containerfile
         run: |
           cat > Containerfile<<EOF
 
@@ -52,8 +50,64 @@ jobs:
           ENTRYPOINT [ "sh", "-c", "echo -n 'Machine: ' && uname -m && echo -n 'Bits: ' && getconf LONG_BIT && echo 'goodbye world'" ]
           EOF
 
-      - name: Create Containerfile (platform=linux/${{ matrix.arch }})
-        if: matrix.specify_platform
+      - name: Build Image
+        id: build_image_multiarch
+        uses: ./buildah-build/
+        with:
+          image: ${{ env.IMAGE_NAME }}
+          tags: ${{ env.IMAGE_TAG }}
+          arch: ${{ matrix.arch }}
+          build-args: ARCH=${{ matrix.arch }}
+          containerfiles: |
+            ./Containerfile
+
+      - name: Echo Outputs
+        run: |
+          echo "Image: ${{ steps.build_image_multiarch.outputs.image }}"
+          echo "Tags: ${{ steps.build_image_multiarch.outputs.tags }}"
+          echo "Tagged Image: ${{ steps.build_image_multiarch.outputs.image-with-tag }}"
+
+      - name: Check images created
+        run: buildah images | grep '${{ env.IMAGE_NAME }}'
+
+      - name: Check image metadata
+        run: |
+          set -x
+          buildah inspect ${{ steps.build_image_multiarch.outputs.image }}:${{ env.IMAGE_TAG }} | jq ".OCIv1.architecture"
+          buildah inspect ${{ steps.build_image_multiarch.outputs.image }}:${{ env.IMAGE_TAG }} | jq ".Docker.architecture"
+
+      - name: Run image
+        run: |
+          podman run --rm ${{ steps.build_image_multiarch.outputs.image }}:${{ env.IMAGE_TAG }}
+
+  build-multiplatform:
+    name: Build multi-platform image using Buildah
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [ "linux/amd64", "linux/arm64v8" ]
+        install_latest: [ true, false ]
+
+    steps:
+
+      # Checkout buildah action github repository
+      - name: Checkout Buildah action
+        uses: actions/checkout@v2
+        with:
+          path: "buildah-build"
+
+      - name: Install latest buildah
+        if: matrix.install_latest
+        run: |
+          bash buildah-build/.github/install_latest_buildah.sh
+
+      - name: Install qemu dependency
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y qemu-user-static
+
+      - name: Create Containerfile
         run: |
           cat > Containerfile<<EOF
 
@@ -64,44 +118,31 @@ jobs:
           ENTRYPOINT [ "sh", "-c", "echo -n 'Machine: ' && uname -m && echo -n 'Bits: ' && getconf LONG_BIT && echo 'goodbye world'" ]
           EOF
 
-      - name: Build Image (arch=${{ matrix.arch }})
-        if: !matrix.specify_platform
-        id: build_image
-        uses: ./buildah-build/
-        with:
-          image: ${{ env.IMAGE_NAME }}
-          tags: ${{ env.IMAGE_TAG }}
-          arch: ${{ matrix.arch }}
-          build-args: ARCH=${{ matrix.arch }}
-          containerfiles: |
-            ./Containerfile
-
-      - name: Build Image (platform=linux/${{ matrix.arch }})
-        if: matrix.specify_platform
-        id: build_image
+      - name: Build Image
+        id: build_image_multiplatform
         uses: ./buildah-build/
         with:
           image: ${{ env.IMAGE_NAME }}
           tags: ${{ env.IMAGE_TAG }}
-          platform: linux/${{ matrix.arch }}
+          platform: ${{ matrix.platform }}
           containerfiles: |
             ./Containerfile
 
       - name: Echo Outputs
         run: |
-          echo "Image: ${{ steps.build_image.outputs.image }}"
-          echo "Tags: ${{ steps.build_image.outputs.tags }}"
-          echo "Tagged Image: ${{ steps.build_image.outputs.image-with-tag }}"
+          echo "Image: ${{ steps.build_image_multiplatform.outputs.image }}"
+          echo "Tags: ${{ steps.build_image_multiplatform.outputs.tags }}"
+          echo "Tagged Image: ${{ steps.build_image_multiplatform.outputs.image-with-tag }}"
 
       - name: Check images created
         run: buildah images | grep '${{ env.IMAGE_NAME }}'
 
       - name: Check image metadata
         run: |
           set -x
-          buildah inspect ${{ steps.build_image.outputs.image }}:${{ env.IMAGE_TAG }} | jq ".OCIv1.architecture"
-          buildah inspect ${{ steps.build_image.outputs.image }}:${{ env.IMAGE_TAG }} | jq ".Docker.architecture"
+          buildah inspect ${{ steps.build_image_multiplatform.outputs.image }}:${{ env.IMAGE_TAG }} | jq ".OCIv1.architecture"
+          buildah inspect ${{ steps.build_image_multiplatform.outputs.image }}:${{ env.IMAGE_TAG }} | jq ".Docker.architecture"
 
       - name: Run image
         run: |
-          podman run --rm ${{ steps.build_image.outputs.image }}:${{ env.IMAGE_TAG }}
+          podman run --rm ${{ steps.build_image_multiplatform.outputs.image }}:${{ env.IMAGE_TAG }}