From de03b867ecb4da37560de6fbb9e964ff59a667fa Mon Sep 17 00:00:00 2001
From: Lily Foster <lily@lily.flowers>
Date: Fri, 31 May 2024 09:13:08 -0400
Subject: [PATCH] ci: use build matrix for building and caching stable packages
 as well

---
 .github/mergify.yml      |  6 ++++--
 .github/workflows/ci.yml | 38 +++++++++++++++++++-------------------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index da47aced..b2d6f073 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -6,8 +6,10 @@ pull_request_rules:
         - author=github-actions[bot]
       - label=dependencies
 
-      - check-success=Build - x86_64-linux
-      - check-success=Build - aarch64-linux
+      - check-success=Build - x86_64-linux - vm.closure
+      - check-success=Build - aarch64-linux - vm.closure
+      - check-success=Build - x86_64-linux - vm-stable.closure
+      - check-success=Build - aarch64-linux - vm-stable.closure
     actions:
       merge:
         method: squash
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c7bbcde3..5bbde58a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,26 +8,22 @@ on:
   workflow_dispatch:
 
 jobs:
-  build_x86_64_linux:
-    name: Build - x86_64-linux
-    runs-on: [linux, X64, drakon64/github-actions-runner-aws, EC2-r7i.large, EBS-30GB]
+  build:
+    strategy:
+      matrix:
+        architecture:
+          - system: x86_64-linux
+            runner: [linux, X64, drakon64/github-actions-runner-aws, EC2-r7i.large, EBS-30GB]
+          - system: aarch64-linux
+            runner: [linux, ARM64, drakon64/github-actions-runner-aws, EC2-r7g.large, EBS-30GB]
+        attribute:
+          - vm.closure
+          - vm-stable.closure
+
+    name: Build - ${{ matrix.architecture.system }} - ${{ matrix.attribute }}
+    runs-on: ${{ matrix.architecture.runner }}
     timeout-minutes: 1440
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: DeterminateSystems/nix-installer-action@v11
 
-      - uses: cachix/cachix-action@v15
-        with:
-          name: cosmic
-          authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
-
-      - run: nix -vL build --show-trace --cores 1 --max-jobs 1 .#vm.closure
-
-  build_aarch64_linux:
-    name: Build - aarch64-linux
-    runs-on: [linux, ARM64, drakon64/github-actions-runner-aws, EC2-r7g.large, EBS-30GB]
-    timeout-minutes: 1440
     steps:
       - uses: actions/checkout@v4
 
@@ -38,4 +34,8 @@ jobs:
           name: cosmic
           authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
 
-      - run: nix -vL build --show-trace --cores 1 --max-jobs 1 .#vm.closure
+      - env:
+          SYSTEM: ${{ matrix.architecture.system }}
+          ATTRIBUTE: ${{ matrix.attribute }}
+        run: |
+          nix -vL build --show-trace --cores 1 --max-jobs 1 --system "$SYSTEM" ".#$ATTRIBUTE"