From f0aee8376ed358f7ce7e3c9dfff2d99c392820cd Mon Sep 17 00:00:00 2001
From: Edward Amsden <edward@blackriversoft.com>
Date: Sun, 10 Dec 2023 15:20:02 -0600
Subject: [PATCH] ci: properly determine nix platform attribute and cache nix
 artifacts

---
 .github/scripts/arch/get-runner-arch | 16 ++++++++++++
 .github/workflows/ares-shared.yml    | 39 ++++++++++++++++++++++++++--
 2 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100755 .github/scripts/arch/get-runner-arch

diff --git a/.github/scripts/arch/get-runner-arch b/.github/scripts/arch/get-runner-arch
new file mode 100755
index 0000000..e7c4f10
--- /dev/null
+++ b/.github/scripts/arch/get-runner-arch
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+# This could be improved by separately looking up OS and architecture
+# but it will do for now.
+for kv in "X64-Linux,x86_64-linux" "X64-macOS,x86_64-darwin" "ARM64-macOS,aarch64-darwin"; do
+  KEY=${kv%,*};
+  VAL=${kv#*,};
+
+  if [ "$KEY" = "${1}-${2}" ]
+  then
+    echo "nix-arch=${VAL}"
+    exit 0
+  fi
+done
+echo "Unknown Github runner arch-os pair: ${1}-${2}"
+exit 1
diff --git a/.github/workflows/ares-shared.yml b/.github/workflows/ares-shared.yml
index 9641fea..fe7aba4 100644
--- a/.github/workflows/ares-shared.yml
+++ b/.github/workflows/ares-shared.yml
@@ -15,6 +15,13 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      # Determine proper nix platform attribute for runner
+      - name: Determine Nix platform
+        id: set-nix-platform
+        working-directory: .
+        run:
+          .github/scripts/arch/get-runner-arch ${{ runner.arch }} ${{ runner.os }} > $GITHUB_OUTPUT
+
       # Install nix, required by nix-shell-action
       - uses: cachix/install-nix-action@v23
         name: Install Nix
@@ -22,13 +29,32 @@ jobs:
           extra_nix_config: "extra-experimental-features = nix-command flakes"
 
       - name: Set cache key for dev env
-        run: export ARES_NIX_DEVSHELL_PATH=$(nix eval --raw ".#devShells.x86_64-linux.default.outPath")
+        id: set-cache-key
+        run: |
+          echo "Determining devshell path for platform ${{ steps.set-nix-platform.outputs.nix-arch }}"
+          echo "nix-devshell-path=$(nix eval --raw ".#devShells.${{ steps.set-nix-platform.outputs.nix-arch }}.default.outPath")" >> $GITHUB_OUTPUT
+
+      - name: Cache nix build artifacts
+        id: nix-cache
+        uses: actions/cache@v3
+        with:
+          path: |
+            nix-devshell.nixstore
+          key: nix-${{ steps.set-cache-key.outputs.nix-devshell-path }}
+
+      - name: Restore cached nix artifacts
+        if: steps.nix-cache.outputs.cache-hit == 'true'
+        working-directory: .
+        run: |
+          pwd
+          ls
+          nix-store --import < nix-devshell.nixstore
 
       - name: Cache rust build artifacts
         id: cache_rust
         uses: Swatinem/rust-cache@v2
         with:
-          env-vars: "CARGO CC CFLAGX CXX CMAKE RUST ARES"
+          key: rust-${{ steps.set-cache-key.outputs.nix-devshell-path }}
           workspaces: "rust/ares -> target"
 
       # Check formatting
@@ -56,3 +82,12 @@ jobs:
         run: |
           nix develop --command bash -c "cargo test --verbose -- --test-threads=1"
 
+      - name: Build nix cache export
+        if: steps.nix-cache.outputs.cache-hit != 'true'
+        run: |
+          pwd
+          nix eval --json ".#devShells.${{ steps.set-nix-platform.outputs.nix-arch }}.default.buildInputs" 2>/dev/null
+          nix eval --json ".#devShells.${{ steps.set-nix-platform.outputs.nix-arch }}.default.buildInputs" 2>/dev/null | jq -r '.[]' | xargs nix-store --query --requisites
+          nix-store --export $(nix eval --json ".#devShells.${{ steps.set-nix-platform.outputs.nix-arch }}.default.buildInputs" 2>/dev/null | jq -r '.[]' | xargs nix-store --query --requisites) > ../../nix-devshell.nixstore
+          ls -lh
+