Merge pull request #1011 from kachick/uninstall-magic-cache

Remove magic-nix-cache-action and cache-clean logics
kachick · Dec 30, 2024 · 05491e3 · 05491e3
2 parents ae037f5 + f07e709
commit 05491e3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 70 deletions.
diff --git a/.github/workflows/ci-home.yml b/.github/workflows/ci-home.yml
@@ -54,10 +54,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: DeterminateSystems/nix-installer-action@v16
-      # Don't use DeterminateSystems/magic-nix-cache-action for Linux until https://github.com/DeterminateSystems/magic-nix-cache-action/issues/26 is supported
-      - uses: DeterminateSystems/magic-nix-cache-action@v8
-        # Always slow. Especially since GH-924
-        if: runner.os == 'macOS' && runner.arch == 'X64'
+      # Don't use DeterminateSystems/magic-nix-cache-action until https://github.com/DeterminateSystems/magic-nix-cache-action/issues/26 is supported
       - name: Print some dotfiles overviews
         run: |
           </etc/nix/nix.conf

diff --git a/.github/workflows/cleanup-caches.yml b/.github/workflows/cleanup-caches.yml
diff --git a/cmd/gen_matrix/main.go b/cmd/gen_matrix/main.go
@@ -28,7 +28,7 @@ func main() {
 		paths = rest
 		line = strings.TrimSuffix(line, "\r")
 
-		if strings.Contains(line, "darwin") || line == "home-manager/packages.nix" || line == "flake.nix" {
+		if strings.Contains(line, "darwin") || line == ".github/workflows/ci-home.yml" || line == "home-manager/packages.nix" || line == "flake.nix" {
 			higherMacOSPossibility = true
 		}
 	}