Merge pull request #14 from DeterminateSystems/pr-12-fixups

Pr 12 fixups

.github/workflows/build.yaml

@@ -5,25 +5,27 @@ on:
   workflow_call:
 
 jobs:
-  # build-artifacts-X64-macOS:
-  #   runs-on: macos-12
-  #   steps:
-  #     - uses: actions/checkout@v3
+  build-artifacts-X64-macOS:
+    runs-on: macos-12
+    steps:
+      - uses: actions/checkout@v3
 
-  #     - uses: DeterminateSystems/flake-checker-action@v4
+      - uses: DeterminateSystems/flake-checker-action@v4
 
-  #     - uses: DeterminateSystems/nix-installer-action@v4
+      - uses: DeterminateSystems/nix-installer-action@v4
 
-  #     - name: Build package
-  #       run: "nix build .# -L"
+      # - uses: DeterminateSystems/magic-nix-cache-action@main
 
-  #     - name: Upload a Build Artifact
-  #       uses: actions/upload-artifact@v3.1.2
-  #       with:
-  #         # Artifact name
-  #         name: magic-nix-cache-X64-macOS
-  #         path: result/bin/magic-nix-cache
-  #         retention-days: 1
+      - name: Build package
+        run: "nix build .# -L"
+
+      - name: Upload a Build Artifact
+        uses: actions/upload-artifact@v3.1.2
+        with:
+          # Artifact name
+          name: magic-nix-cache-X64-macOS
+          path: result/bin/magic-nix-cache
+          retention-days: 1
 
   build-artifacts-X64-Linux:
     runs-on: ubuntu-22.04
@@ -34,6 +36,8 @@ jobs:
 
       - uses: DeterminateSystems/nix-installer-action@v4
 
+      - uses: DeterminateSystems/magic-nix-cache-action@main
+
       - name: Build package
         run: "nix build .# -L"
 

.github/workflows/checks.yaml

@@ -19,8 +19,10 @@ jobs:
         with:
           fail-mode: true
 
+      - uses: DeterminateSystems/magic-nix-cache-action@main
+
       - name: Check Rust formatting
         run: nix develop --command cargo fmt --check
-      
+
       - name: Clippy
         run: nix develop --command cargo clippy

.github/workflows/release-branches.yml

@@ -31,12 +31,12 @@ jobs:
       - name: Create the artifacts directory
         run: rm -rf ./artifacts && mkdir ./artifacts
 
-      # - uses: actions/download-artifact@v3
-      #   with:
-      #     name: magic-nix-cache-X64-macOS
-      #     path: cache-binary-X64-macOS
-      # - name: Persist the cache binary
-      #   run: cp ./cache-binary-X64-macOS/magic-nix-cache ./artifacts/magic-nix-cache-X64-macOS
+      - uses: actions/download-artifact@v3
+        with:
+          name: magic-nix-cache-X64-macOS
+          path: cache-binary-X64-macOS
+      - name: Persist the cache binary
+        run: cp ./cache-binary-X64-macOS/magic-nix-cache ./artifacts/magic-nix-cache-X64-macOS
 
       - uses: actions/download-artifact@v3
         with:

.github/workflows/release-prs.yml

@@ -35,12 +35,12 @@ jobs:
       - name: Create the artifacts directory
         run: rm -rf ./artifacts && mkdir ./artifacts
 
-      # - uses: actions/download-artifact@v3
-      #   with:
-      #     name: magic-nix-cache-X64-macOS
-      #     path: cache-binary-X64-macOS
-      # - name: Persist the cache binary
-      #   run: cp ./cache-binary-X64-macOS/magic-nix-cache ./artifacts/magic-nix-cache-X64-macOS
+      - uses: actions/download-artifact@v3
+        with:
+          name: magic-nix-cache-X64-macOS
+          path: cache-binary-X64-macOS
+      - name: Persist the cache binary
+        run: cp ./cache-binary-X64-macOS/magic-nix-cache ./artifacts/magic-nix-cache-X64-macOS
 
       - uses: actions/download-artifact@v3
         with:

.github/workflows/release-tags.yml

@@ -24,12 +24,12 @@ jobs:
       - name: Create the artifacts directory
         run: rm -rf ./artifacts && mkdir ./artifacts
 
-      # - uses: actions/download-artifact@v3
-      #   with:
-      #     name: magic-nix-cache-X64-macOS
-      #     path: cache-binary-X64-macOS
-      # - name: Persist the cache binary
-      #   run: cp ./cache-binary-X64-macOS/magic-nix-cache ./artifacts/magic-nix-cache-X64-macOS
+      - uses: actions/download-artifact@v3
+        with:
+          name: magic-nix-cache-X64-macOS
+          path: cache-binary-X64-macOS
+      - name: Persist the cache binary
+        run: cp ./cache-binary-X64-macOS/magic-nix-cache ./artifacts/magic-nix-cache-X64-macOS
 
       - uses: actions/download-artifact@v3
         with:

README.md

@@ -3,7 +3,7 @@
 Save 30-50%+ of CI time without any effort or cost.
 Use Magic Nix Cache, a totally free and zero-configuration binary cache for Nix on GitHub Actions.
 
-Magix Nix Cache uses the GitHub Actions [built-in cache][ghacache] to share builds between Workflow runs, and has many advantages over alternatives.
+Magic Nix Cache uses the GitHub Actions [built-in cache][ghacache] to share builds between Workflow runs, and has many advantages over alternatives.
 
 1. Totally free: backed by GitHub Actions' cache, there is no additional service to pay for.
 1. Zero configuration: add our action to your workflow. That's it.
@@ -72,7 +72,7 @@ Here is a table of the [telemetry data we collect][telemetry]:
 | `nars_uploaded`                  | Number of nars uploaded during this run.                                                                         |
 | `num_original_paths`             | Number of store paths that existed on startup.                                                                   |
 | `num_final_paths`                | Number of store paths that existed on shutdown.                                                                  |
-| `num_new_paths`                  | The diference between `num_original_paths` and `num_final_paths`.                                                |
+| `num_new_paths`                  | The difference between `num_original_paths` and `num_final_paths`.                                               |
 
 To disable diagnostic reporting, set the diagnostics URL to an empty string by passing `--diagnostic-endpoint=""`.