From 9c6cc44abb286b911b2c208099bc47473deacf97 Mon Sep 17 00:00:00 2001
From: morguldir <morguldir@protonmail.com>
Date: Wed, 3 Jul 2024 01:56:14 +0200
Subject: [PATCH] ci: use correct config file

also had to try putting it at the end again
---
 .github/workflows/ci.yml | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0c228e4f..e83c86a3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,6 +16,7 @@ on:
           - 'docker/**'
         branches:
             - main
+            - change-ci-cache
         tags:
           - '*'
     # Allows you to run this workflow manually from the Actions tab
@@ -64,7 +65,7 @@ jobs:
                     exit 1
                   fi
 
-            - uses: nixbuild/nix-quick-install-action@v27
+            - uses: nixbuild/nix-quick-install-action@v28
 
             - name: Enable Cachix binary cache
               run: |
@@ -76,37 +77,34 @@ jobs:
               uses: nix-community/cache-nix-action@v5
               with:
                 # restore and save a cache using this key
-                primary-key: nix-${{ runner.os }}-${{ hashFiles('**/*.nix') }}
+                primary-key: nix-${{ runner.os }}-${{ hashFiles('**/*.nix', '**/.lock') }}
                 # if there's no cache hit, restore a cache by this prefix
                 restore-prefixes-first-match: nix-${{ runner.os }}-
                 # collect garbage until Nix store size (in bytes) is at most this number
                 # before trying to save a new cache
-                gc-max-store-size-linux: 1073741824
+                gc-max-store-size-linux: 2073741824
                 # do purge caches
                 purge: true
                 # purge all versions of the cache
-                purge-prefixes: cache-${{ runner.os }}-
+                purge-prefixes: nix-${{ runner.os }}-
                 # created more than this number of seconds ago relative to the start of the `Post Restore` phase
-                purge-created: 0
+                purge-last-accessed: 86400
                 # except the version with the `primary-key`, if it exists
                 purge-primary-key: never
+                # always save the cache
+                save-always: true
 
             - name: Apply Nix binary cache configuration
               run: |
-                  echo "before: " && cat /etc/nix/nix.conf
-                  cat /etc/nix/nix.conf
-                  sudo tee -a /etc/nix/nix.conf > /dev/null <<EOF
+                  sudo tee -a "${XDG_CONFIG_HOME:-$HOME/.config}/nix/nix.conf" > /dev/null <<EOF
                   extra-substituters = https://attic.kennel.juneis.dog/conduit https://attic.kennel.juneis.dog/conduwuit https://cache.lix.systems https://conduwuit.cachix.org
                   extra-trusted-public-keys = conduit:eEKoUwlQGDdYmAI/Q/0slVlegqh/QmAvQd7HBSm21Wk= conduwuit:BbycGUgTISsltcmH0qNjFR9dbrQNYgdIAcmViSGoVTE= cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o= conduwuit.cachix.org-1:MFRm6jcnfTf0jSAbmvLfhO3KBMt4px+1xaereWXp8Xg=
                   EOF
-                  echo "after: " && cat /etc/nix/nix.conf
-                  echo "local: " && cat $HOME/.config/nix/nix.conf
-                  echo "local2: " && cat ~/.config/nix/nix.conf
 
             - name: Use alternative Nix binary caches if specified
               if: ${{ (env.ATTIC_ENDPOINT != '') && (env.ATTIC_PUBLIC_KEY != '') }}
               run: |
-                  sudo tee -a /etc/nix/nix.conf > /dev/null <<EOF
+                  sudo tee -a "${XDG_CONFIG_HOME:-$HOME/.config}/nix/nix.conf" > /dev/null <<EOF
                   extra-substituters = ${{ env.ATTIC_ENDPOINT }}
                   extra-trusted-public-keys = ${{ env.ATTIC_PUBLIC_KEY }}
                   EOF