build-gg-lite.yml, build-gg.yml: change way of specifying jobs

Author: thomas-roos

.github/workflows/build-gg-lite.yml

@@ -36,22 +36,30 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        device:
-          - qemuarm
-          - qemuarm64
-          - qemux86-64
-          - aws-ec2-arm64
-          - aws-ec2-x86-64
-          - raspberrypi2
-          - raspberrypi-64
-          - stm32mp13-disco
-        image:
-          - aws-iot-greengrass-lite-demo-image
-          - aws-iot-greengrass-lite-demo-simple-image
-          - aws-iot-greengrass-lite-demo-tiny-image
-        exclude:
-          - image: aws-iot-greengrass-lite-demo-image
-            device: qemuarm, qemuarm64, qemux86-64, aws-ec2-arm64, aws-ec2-x86-64, stm32mp13-disco
+        include:
+          # aws-iot-greengrass-lite-demo-image (only on raspberrypi devices)
+          - { device: raspberrypi2, image: aws-iot-greengrass-lite-demo-image }
+          - { device: raspberrypi-64, image: aws-iot-greengrass-lite-demo-image }
+          # aws-iot-greengrass-lite-demo-simple-image (all devices)
+          - { device: qemuarm, image: aws-iot-greengrass-lite-demo-simple-image }
+          - { device: qemuarm64, image: aws-iot-greengrass-lite-demo-simple-image }
+          - { device: qemux86-64, image: aws-iot-greengrass-lite-demo-simple-image }
+          - { device: aws-ec2-arm64, image: aws-iot-greengrass-lite-demo-simple-image }
+          - { device: aws-ec2-x86-64, image: aws-iot-greengrass-lite-demo-simple-image }
+          - { device: raspberrypi2, image: aws-iot-greengrass-lite-demo-simple-image }
+          - { device: raspberrypi-64, image: aws-iot-greengrass-lite-demo-simple-image }
+          - { device: stm32mp13-disco, image: aws-iot-greengrass-lite-demo-simple-image }
+          # aws-iot-greengrass-lite-demo-tiny-image (all devices)
+          - { device: qemuarm, image: aws-iot-greengrass-lite-demo-tiny-image }
+          - { device: qemuarm64, image: aws-iot-greengrass-lite-demo-tiny-image }
+          - { device: qemux86-64, image: aws-iot-greengrass-lite-demo-tiny-image }
+          - { device: aws-ec2-arm64, image: aws-iot-greengrass-lite-demo-tiny-image }
+          - { device: aws-ec2-x86-64, image: aws-iot-greengrass-lite-demo-tiny-image }
+          - { device: raspberrypi2, image: aws-iot-greengrass-lite-demo-tiny-image }
+          - { device: raspberrypi-64, image: aws-iot-greengrass-lite-demo-tiny-image }
+          - { device: stm32mp13-disco, image: aws-iot-greengrass-lite-demo-tiny-image }
+          # aws-iot-greengrass-lite-container-demo-image (qemuarm64 only)
+          - { device: qemuarm64, image: aws-iot-greengrass-lite-container-demo-image }
     runs-on: codebuild-${{ vars.CODEBUILD_RUNNER_NAME }}-${{ github.run_id }}-${{ github.run_attempt }}
     steps:
       - name: checkout meta-aws-demos branch to build

.github/workflows/build-gg.yml

@@ -36,21 +36,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        device:
-          - qemuarm
-          - qemuarm64
-          - qemux86-64
-          - aws-ec2-arm64
-          - aws-ec2-x86-64
-          - raspberrypi2
-          - raspberrypi-64
-          - stm32mp13-disco
-        image:
-          - aws-iot-greengrass-demo-image
-          - aws-iot-greengrass-demo-simple-image
-        exclude:
-          - image: aws-iot-greengrass-demo-image
-            device: qemuarm, qemuarm64, qemux86-64, aws-ec2-arm64, aws-ec2-x86-64
+        include:
+          # aws-iot-greengrass-demo-image (only on raspberrypi devices)
+          - { device: raspberrypi2, image: aws-iot-greengrass-demo-image }
+          - { device: raspberrypi-64, image: aws-iot-greengrass-demo-image }
+          # aws-iot-greengrass-demo-simple-image (all devices)
+          - { device: qemuarm, image: aws-iot-greengrass-demo-simple-image }
+          - { device: qemuarm64, image: aws-iot-greengrass-demo-simple-image }
+          - { device: qemux86-64, image: aws-iot-greengrass-demo-simple-image }
+          - { device: aws-ec2-arm64, image: aws-iot-greengrass-demo-simple-image }
+          - { device: aws-ec2-x86-64, image: aws-iot-greengrass-demo-simple-image }
+          - { device: raspberrypi2, image: aws-iot-greengrass-demo-simple-image }
+          - { device: raspberrypi-64, image: aws-iot-greengrass-demo-simple-image }
+          - { device: stm32mp13-disco, image: aws-iot-greengrass-demo-simple-image }
     runs-on: codebuild-${{ vars.CODEBUILD_RUNNER_NAME }}-${{ github.run_id }}-${{ github.run_attempt }}
     steps:
       - name: checkout meta-aws-demos branch to build