From 2a0fe0b106fae625dbb34cd1c4b173ef7498aa53 Mon Sep 17 00:00:00 2001
From: ahuston-0 <aliceghuston@gmail.com>
Date: Mon, 10 Mar 2025 00:48:57 -0400
Subject: [PATCH 1/3] fix os matrix?

---
 .github/workflows/cache-merge.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/cache-merge.yml b/.github/workflows/cache-merge.yml
index b6e84b6..ee7a5f9 100644
--- a/.github/workflows/cache-merge.yml
+++ b/.github/workflows/cache-merge.yml
@@ -20,8 +20,7 @@ jobs:
     name: Merge similar caches
     strategy:
       matrix:
-        os:
-          - [ubuntu-latest]
+        os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout this repo
@@ -70,8 +69,7 @@ jobs:
     needs: merge-similar-caches
     strategy:
       matrix:
-        os:
-          - [ubuntu-latest]
+        os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout this repo
-- 
2.48.1


From ea5616416a785accbb9a48708f6e833a99d3a757 Mon Sep 17 00:00:00 2001
From: ahuston-0 <aliceghuston@gmail.com>
Date: Mon, 10 Mar 2025 01:06:56 -0400
Subject: [PATCH 2/3] remove cache max limit

---
 utils/attic-push.bash | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/utils/attic-push.bash b/utils/attic-push.bash
index 80755ba..0c15588 100755
--- a/utils/attic-push.bash
+++ b/utils/attic-push.bash
@@ -6,10 +6,16 @@
 set -e
 
 # retrieve all paths under 2G
+# nix_paths=$(nix path-info --json --all --closure-size \
+#   | jq 'map_values(.closureSize | select(. < 2e9)) | to_entries | sort_by(.value)' \
+#   | jq 'map(.key) | join("\n")' | sed -E -e 's/\\n/\n/g;s/^"//g;s/"$//g')
+
+# retrieve all paths
 nix_paths=$(nix path-info --json --all --closure-size \
-  | jq 'map_values(.closureSize | select(. < 2e9)) | to_entries | sort_by(.value)' \
+  | jq 'map_values(.closureSize | select(true)) | to_entries | sort_by(.value)' \
   | jq 'map(.key) | join("\n")' | sed -E -e 's/\\n/\n/g;s/^"//g;s/"$//g')
 
+
 readarray -t nix_path_array < <(echo "$nix_paths")
 
 batchsize=1000
-- 
2.48.1


From 050b4c9b2f75fe9c64bbe29607095fd93722981f Mon Sep 17 00:00:00 2001
From: ahuston-0 <aliceghuston@gmail.com>
Date: Mon, 10 Mar 2025 01:23:20 -0400
Subject: [PATCH 3/3] reorder oops

---
 .github/workflows/flake-health-checks.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/flake-health-checks.yml b/.github/workflows/flake-health-checks.yml
index a3fc849..344be26 100644
--- a/.github/workflows/flake-health-checks.yml
+++ b/.github/workflows/flake-health-checks.yml
@@ -16,6 +16,8 @@ jobs:
     steps:
       - uses: DeterminateSystems/nix-installer-action@main
 
+      - uses: actions/checkout@v4
+
       - name: Restore Nix store
         id: restore
         uses: nix-community/cache-nix-action@v6
@@ -33,8 +35,6 @@ jobs:
           token: ${{ secrets.ATTIC_TOKEN }}
           skip-push: "true"
 
-      - uses: actions/checkout@v4
-
       - run: nix flake check --accept-flake-config
 
       - run: nix ./utils/attic-push.bash
@@ -48,6 +48,8 @@ jobs:
     steps:
       - uses: DeterminateSystems/nix-installer-action@main
 
+      - uses: actions/checkout@v4
+
       - name: Restore Nix store
         id: restore
         uses: nix-community/cache-nix-action@v6
@@ -65,8 +67,6 @@ jobs:
           token: ${{ secrets.ATTIC_TOKEN }}
           skip-push: "true"
 
-      - uses: actions/checkout@v4
-
       - name: Build all outputs
         run: nix run git+https://nayeonie.com/ahuston-0/flake-update-diff -- --build .
 
-- 
2.48.1