From 677a0e7b7e3aebe613964ee0ada64cf1f4dec1da Mon Sep 17 00:00:00 2001
From: Daniel Hollas <daniel.hollas@bristol.ac.uk>
Date: Tue, 23 Apr 2024 11:21:14 +0100
Subject: [PATCH] Streamline main

---
 .github/workflows/main.yml | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 91b4a42e..fbcf6a1f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,31 +27,23 @@ jobs:
         with:
             runsOn: ${{ matrix.runsOn }}
 
-    test-amd64:
+    test:
         needs: build
         strategy:
             fail-fast: false
             matrix:
-                # NOTE: amd64 full-stack image is tested during build step
-                target: ["base", "lab", "base-with-services"]
+                target: [base, lab, base-with-services, full-stack]
+                runsOn: [ubuntu-22.04] #, ARM64
 
         uses: ./.github/workflows/test.yml
+        #if: matrix.runsOn == 'ubuntu-22.04' || matrix.target == 'full-stack'
+        if: false
         with:
-            runsOn: ubuntu-22.04
+            runsOn: ${{ matrix.runsOn }}
             images: ${{ needs.build.outputs.images }}
             target: ${{ matrix.target }}
             integration: false
 
-    # To save self-hosted runner resources, we're only testing full-stack image
-    test-arm64:
-        needs: build
-        uses: ./.github/workflows/test.yml
-        with:
-            runsOn: ARM64
-            images: ${{ needs.build.outputs.images }}
-            target: "full-stack"
-            integration: false
-
     test-integration:
         needs: build
         strategy:
@@ -59,6 +51,7 @@ jobs:
             matrix:
                 runner: ["ubuntu-22.04"] #, "ARM64"]
         uses: ./.github/workflows/test.yml
+        if: false
         with:
             runsOn: ${{ matrix.runner }}
             images: ${{ needs.build.outputs.images }}