Reenable caching for nix workflows

This has been fixed upstream. Pull the change in early to speed up all our workflows significantly. Fixes: TraceMachina#464
aaronmondal · Jan 25, 2024 · 9164bd6 · 9164bd6
1 parent 39c6678
commit 9164bd6
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 12 deletions.
diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml
@@ -26,13 +26,13 @@ jobs:
         uses: >- # v7
           DeterminateSystems/nix-installer-action@5620eb4af6b562c53e4d4628c0b6e4f9d9ae8612
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+          # TODO(aaronmondal): Remove after:
+          # https://github.com/DeterminateSystems/nix-installer/pull/820
+          nix-installer-pr: 820
 
-      # TODO(aaronmondal): Caching is flaky for this workflow.
-      # See: https://github.com/DeterminateSystems/magic-nix-cache/issues/32
-      # - name: Cache Nix derivations
-      #   uses: >- # Custom commit, last pinned at 2023-11-17.
-      #     DeterminateSystems/magic-nix-cache-action@a04e6275a6bea232cd04fc6f3cbf20d4cb02a3e1
+      - name: Cache Nix derivations
+        uses: >- # Custom commit, last pinned at 2023-11-17.
+          DeterminateSystems/magic-nix-cache-action@a04e6275a6bea232cd04fc6f3cbf20d4cb02a3e1
 
       - name: Test image
         run: |

diff --git a/.github/workflows/lre.yaml b/.github/workflows/lre.yaml
@@ -26,6 +26,10 @@ jobs:
       - name: Install Nix
         uses: >- #v7
           DeterminateSystems/nix-installer-action@5620eb4af6b562c53e4d4628c0b6e4f9d9ae8612
+        with:
+          # TODO(aaronmondal): Remove after:
+          # https://github.com/DeterminateSystems/nix-installer/pull/820
+          nix-installer-pr: 820
 
       - name: Cache Nix derivations
         uses: >- # Custom commit, last pinned at 2023-11-17.
@@ -54,12 +58,14 @@ jobs:
       - name: Install Nix
         uses: >- #v7
           DeterminateSystems/nix-installer-action@5620eb4af6b562c53e4d4628c0b6e4f9d9ae8612
+        with:
+          # TODO(aaronmondal): Remove after:
+          # https://github.com/DeterminateSystems/nix-installer/pull/820
+          nix-installer-pr: 820
 
-      # TODO(aaronmondal): Caching is flaky for this workflow.
-      # See: https://github.com/DeterminateSystems/magic-nix-cache/issues/32
-      # - name: Cache Nix derivations
-      #   uses: >- # Custom commit, last pinned at 2023-11-17.
-      #     DeterminateSystems/magic-nix-cache-action@a04e6275a6bea232cd04fc6f3cbf20d4cb02a3e1
+      - name: Cache Nix derivations
+        uses: >- # Custom commit, last pinned at 2023-11-17.
+          DeterminateSystems/magic-nix-cache-action@a04e6275a6bea232cd04fc6f3cbf20d4cb02a3e1
 
       - name: Start Kubernetes cluster (Infra)
         run: >

diff --git a/.github/workflows/nix.yaml b/.github/workflows/nix.yaml
@@ -26,6 +26,10 @@ jobs:
       - name: Install Nix
         uses: >- #v7
           DeterminateSystems/nix-installer-action@5620eb4af6b562c53e4d4628c0b6e4f9d9ae8612
+        with:
+          # TODO(aaronmondal): Remove after:
+          # https://github.com/DeterminateSystems/nix-installer/pull/820
+          nix-installer-pr: 820
 
       - name: Cache Nix derivations
         uses: >- # Custom commit, last pinned at 2023-11-17.
@@ -58,6 +62,10 @@ jobs:
       - name: Install Nix
         uses: >- #v7
           DeterminateSystems/nix-installer-action@5620eb4af6b562c53e4d4628c0b6e4f9d9ae8612
+        with:
+          # TODO(aaronmondal): Remove after:
+          # https://github.com/DeterminateSystems/nix-installer/pull/820
+          nix-installer-pr: 820
 
       - name: Cache Nix derivations
         uses: >- # Custom commit, last pinned at 2023-11-17.

diff --git a/.github/workflows/pre-commit.yaml b/.github/workflows/pre-commit.yaml
@@ -20,6 +20,11 @@ jobs:
       - name: Install Nix
         uses: >- #v7
           DeterminateSystems/nix-installer-action@5620eb4af6b562c53e4d4628c0b6e4f9d9ae8612
+        with:
+          # TODO(aaronmondal): Remove after:
+          # https://github.com/DeterminateSystems/nix-installer/pull/820
+          nix-installer-pr: 820
+
       - name: Cache Nix derivations
         uses: >- # Custom commit, last pinned at 2023-11-17.
           DeterminateSystems/magic-nix-cache-action@a04e6275a6bea232cd04fc6f3cbf20d4cb02a3e1

diff --git a/.github/workflows/tagged_image.yaml b/.github/workflows/tagged_image.yaml
@@ -23,7 +23,9 @@ jobs:
         uses: >- # v7
           DeterminateSystems/nix-installer-action@5620eb4af6b562c53e4d4628c0b6e4f9d9ae8612
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+          # TODO(aaronmondal): Remove after:
+          # https://github.com/DeterminateSystems/nix-installer/pull/820
+          nix-installer-pr: 820
 
       - name: Test image
         run: |