From 37d6eb5161033721b9b060c85fd8cb5a60c47b94 Mon Sep 17 00:00:00 2001
From: Luc Perkins <lucperkins@gmail.com>
Date: Wed, 15 May 2024 17:39:35 -0300
Subject: [PATCH 1/4] Add CI run for aarch64-darwin

---
 .github/workflows/ci.yml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c9e5fee..2532346 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,6 +28,7 @@ jobs:
         run: git status --porcelain=v1
       - name: Ensure no staged changes
         run: git diff --exit-code
+
   run-test-suite:
     name: Run test suite
     strategy:
@@ -36,6 +37,7 @@ jobs:
           - ubuntu-latest
           - nscloud-ubuntu-22.04-amd64-4x16
           - namespace-profile-default-arm64
+          - 
     runs-on: ${{ matrix.runner }}
     permissions:
       contents: read
@@ -116,9 +118,15 @@ jobs:
           duration: 5m
           authorized-users: grahamc
 
-  run-x86_64-darwin:
-    name: Run x86_64 Darwin
-    runs-on: macos-12
+  run-darwin:
+    strategy:
+      matrix:
+        runner:
+          # x86_64-darwin
+          - macos-12
+          # aarch64-darwin
+          - macos-latest-xlarge
+    runs-on: ${{ matrix.runner }}
     permissions:
       contents: read
       id-token: write

From 83c8f7dfddcce3cf58e82f87b14661defdec2b80 Mon Sep 17 00:00:00 2001
From: Luc Perkins <lucperkins@gmail.com>
Date: Wed, 15 May 2024 17:44:11 -0300
Subject: [PATCH 2/4] Fix formatting

---
 .github/workflows/ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2532346..d727fe1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,7 +37,6 @@ jobs:
           - ubuntu-latest
           - nscloud-ubuntu-22.04-amd64-4x16
           - namespace-profile-default-arm64
-          - 
     runs-on: ${{ matrix.runner }}
     permissions:
       contents: read

From 94a9e4375c1ad8e7881040445cfbdefc675daa4e Mon Sep 17 00:00:00 2001
From: Luc Perkins <lucperkins@gmail.com>
Date: Wed, 15 May 2024 17:56:08 -0300
Subject: [PATCH 3/4] Rename jobs

---
 .github/workflows/ci.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d727fe1..21a6d9e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,8 +29,8 @@ jobs:
       - name: Ensure no staged changes
         run: git diff --exit-code
 
-  run-test-suite:
-    name: Run test suite
+  run-test-suite-linux:
+    name: Run test suite for Linux systems
     strategy:
       matrix:
         runner:
@@ -117,7 +117,8 @@ jobs:
           duration: 5m
           authorized-users: grahamc
 
-  run-darwin:
+  run-test-suite-darwin:
+    name: Run test suite for macOS systems
     strategy:
       matrix:
         runner:

From ca7cf68c6347d5e733b98d729726c5e9cc255324 Mon Sep 17 00:00:00 2001
From: Luc Perkins <lucperkins@gmail.com>
Date: Wed, 15 May 2024 18:16:09 -0300
Subject: [PATCH 4/4] Add megajob called tests

---
 .github/workflows/ci.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 21a6d9e..ea4947a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,6 +7,15 @@ on:
   workflow_dispatch:
 
 jobs:
+  tests:
+    runs-on: ubuntu-22.04
+    needs:
+      - check-dist-up-to-date
+      - install-nix-linux
+      - install-nix-macos
+    steps:
+      - run: true
+
   check-dist-up-to-date:
     name: Check the dist/ folder is up to date
     runs-on: ubuntu-22.04
@@ -29,7 +38,7 @@ jobs:
       - name: Ensure no staged changes
         run: git diff --exit-code
 
-  run-test-suite-linux:
+  install-nix-linux:
     name: Run test suite for Linux systems
     strategy:
       matrix:
@@ -117,7 +126,7 @@ jobs:
           duration: 5m
           authorized-users: grahamc
 
-  run-test-suite-darwin:
+  install-nix-macos:
     name: Run test suite for macOS systems
     strategy:
       matrix: