From 8fa4c519ce3fdc689a3b13cd90544afe456d0e55 Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Mon, 24 Mar 2025 20:14:03 -0300 Subject: [PATCH 1/2] Switch to flakehub-cache-action --- .github/workflows/build.yaml | 4 ++-- .github/workflows/check-and-test.yaml | 9 +++++---- .github/workflows/keygen.yaml | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 936bce5..3263e45 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -32,8 +32,8 @@ jobs: - uses: actions/checkout@v4 - name: Install Nix on ${{ matrix.systems.system }} uses: DeterminateSystems/nix-installer-action@main - - name: Magic Nix Cache - uses: DeterminateSystems/magic-nix-cache-action@main + - name: Set up FlakeHub Cache + uses: DeterminateSystems/flakehub-cache-action@main - name: Build and cache dev shell for ${{ matrix.systems.nix-system }} run: | diff --git a/.github/workflows/check-and-test.yaml b/.github/workflows/check-and-test.yaml index 0a07579..0a03895 100644 --- a/.github/workflows/check-and-test.yaml +++ b/.github/workflows/check-and-test.yaml @@ -15,15 +15,16 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Install Nix - uses: DeterminateSystems/nix-installer-action@main - - uses: DeterminateSystems/magic-nix-cache-action@main - - name: Check health of flake.lock uses: DeterminateSystems/flake-checker-action@main with: fail-mode: true + - name: Install Nix + uses: DeterminateSystems/nix-installer-action@main + + - uses: DeterminateSystems/flakehub-cache-action@main + - name: Check Rust formatting run: nix develop --command cargo fmt --check diff --git a/.github/workflows/keygen.yaml b/.github/workflows/keygen.yaml index ca0ec79..d540ca2 100644 --- a/.github/workflows/keygen.yaml +++ b/.github/workflows/keygen.yaml @@ -8,7 +8,7 @@ jobs: - uses: actions/checkout@v4 - name: Install Nix uses: DeterminateSystems/nix-installer-action@main - - uses: DeterminateSystems/magic-nix-cache-action@main + - uses: DeterminateSystems/flakehub-cache-action@main - name: Expose GitHub Runtime uses: crazy-max/ghaction-github-runtime@v2 - name: Dump credentials From 0dd0d2d0a68623bf0987d519a5002a203f5c3e73 Mon Sep 17 00:00:00 2001 From: Luc Perkins Date: Wed, 26 Mar 2025 10:07:39 -0300 Subject: [PATCH 2/2] Update flake.lock --- flake.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 04a1796..a168517 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1739936662, - "narHash": "sha256-x4syUjNUuRblR07nDPeLDP7DpphaBVbUaSoeZkFbGSk=", + "lastModified": 1742394900, + "narHash": "sha256-vVOAp9ahvnU+fQoKd4SEXB2JG2wbENkpqcwlkIXgUC0=", "owner": "ipetkov", "repo": "crane", - "rev": "19de14aaeb869287647d9461cbd389187d8ecdb7", + "rev": "70947c1908108c0c551ddfd73d4f750ff2ea67cd", "type": "github" }, "original": { @@ -93,12 +93,12 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1739376598, - "narHash": "sha256-EOnBPe+ydQ0/P5ZyWnFekvpyUxMcmh2rnP9yNFi/EqU=", - "rev": "b3e92048335d88553c1d6bbcf280e95b9a1b5a75", - "revCount": 19173, + "lastModified": 1742824067, + "narHash": "sha256-rBPulEBpn4IiqkPsetuh7BRzT2iGCzZYnogTAsbrvhU=", + "rev": "9cb662df7442a1e2c4600fb8ecb2ad613ebc5a95", + "revCount": 19496, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nix/2.26.2/0194fbd7-e2ec-7193-93a9-05ae757e79a1/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nix/2.27.1/0195c8c5-1964-7a31-b025-ebf9bfeef991/source.tar.gz" }, "original": { "type": "tarball", @@ -155,12 +155,12 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1739866667, - "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", - "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", - "revCount": 755230, + "lastModified": 1742422364, + "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", + "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", + "revCount": 770807, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.755230%2Brev-73cf49b8ad837ade2de76f87eb53fc85ed5d4680/01951ca9-35fa-70f2-b972-630b0cd93c65/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.770807%2Brev-a84ebe20c6bc2ecbcfb000a50776219f48d134cc/0195b626-8c1d-7fb9-9282-563af3d37ab9/source.tar.gz" }, "original": { "type": "tarball",