From d1e5b378cd16ccace9b3dc65e67992db59958ab1 Mon Sep 17 00:00:00 2001 From: thesimplekid Date: Wed, 28 May 2025 10:09:45 -0400 Subject: [PATCH] chore: update flake 25.05 remove nix cache (#769) --- .github/workflows/ci.yml | 54 ++++++++-------------------- .github/workflows/nutshell_itest.yml | 12 +++---- flake.lock | 32 ++++++++--------- flake.nix | 2 +- 4 files changed, 36 insertions(+), 64 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f42282e3..d256dba4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Check Nix flake inputs - uses: DeterminateSystems/flake-checker-action@v7 + uses: DeterminateSystems/flake-checker-action@v9 with: fail-mode: true @@ -31,9 +31,7 @@ jobs: - name: checkout uses: actions/checkout@v4 - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v11 - - name: Nix Cache - uses: DeterminateSystems/magic-nix-cache-action@v6 + uses: DeterminateSystems/nix-installer-action@v17 - name: Rust Cache uses: Swatinem/rust-cache@v2 - name: Cargo fmt @@ -65,9 +63,7 @@ jobs: - name: checkout uses: actions/checkout@v4 - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v11 - - name: Nix Cache - uses: DeterminateSystems/magic-nix-cache-action@v6 + uses: DeterminateSystems/nix-installer-action@v17 - name: Rust Cache uses: Swatinem/rust-cache@v2 - name: Run example @@ -150,9 +146,7 @@ jobs: - name: checkout uses: actions/checkout@v4 - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v11 - - name: Nix Cache - uses: DeterminateSystems/magic-nix-cache-action@v6 + uses: DeterminateSystems/nix-installer-action@v17 - name: Rust Cache uses: Swatinem/rust-cache@v2 - name: Clippy @@ -180,9 +174,7 @@ jobs: - name: checkout uses: actions/checkout@v4 - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v11 - - name: Nix Cache - uses: DeterminateSystems/magic-nix-cache-action@v6 + uses: DeterminateSystems/nix-installer-action@v17 - name: Rust Cache uses: Swatinem/rust-cache@v2 - name: Test @@ -208,9 +200,7 @@ jobs: - name: checkout uses: actions/checkout@v4 - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v11 - - name: Nix Cache - uses: DeterminateSystems/magic-nix-cache-action@v6 + uses: DeterminateSystems/nix-installer-action@v17 - name: Rust Cache uses: Swatinem/rust-cache@v2 - name: Clippy @@ -235,9 +225,7 @@ jobs: - name: checkout uses: actions/checkout@v4 - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v11 - - name: Nix Cache - uses: DeterminateSystems/magic-nix-cache-action@v6 + uses: DeterminateSystems/nix-installer-action@v17 - name: Rust Cache uses: Swatinem/rust-cache@v2 - name: Test fake mint @@ -263,9 +251,7 @@ jobs: - name: checkout uses: actions/checkout@v4 - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v11 - - name: Nix Cache - uses: DeterminateSystems/magic-nix-cache-action@v6 + uses: DeterminateSystems/nix-installer-action@v17 - name: Rust Cache uses: Swatinem/rust-cache@v2 - name: Test @@ -301,9 +287,7 @@ jobs: - name: checkout uses: actions/checkout@v4 - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v11 - - name: Nix Cache - uses: DeterminateSystems/magic-nix-cache-action@v6 + uses: DeterminateSystems/nix-installer-action@v17 - name: Rust Cache uses: Swatinem/rust-cache@v2 - name: Build @@ -331,9 +315,7 @@ jobs: - name: checkout uses: actions/checkout@v4 - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v11 - - name: Nix Cache - uses: DeterminateSystems/magic-nix-cache-action@v6 + uses: DeterminateSystems/nix-installer-action@v17 - name: Rust Cache uses: Swatinem/rust-cache@v2 - name: Build cdk and binding @@ -361,9 +343,7 @@ jobs: - name: checkout uses: actions/checkout@v4 - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v11 - - name: Nix Cache - uses: DeterminateSystems/magic-nix-cache-action@v6 + uses: DeterminateSystems/nix-installer-action@v17 - name: Rust Cache uses: Swatinem/rust-cache@v2 - name: Build cdk wasm @@ -385,9 +365,7 @@ jobs: - name: checkout uses: actions/checkout@v4 - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v11 - - name: Nix Cache - uses: DeterminateSystems/magic-nix-cache-action@v6 + uses: DeterminateSystems/nix-installer-action@v17 - name: Rust Cache uses: Swatinem/rust-cache@v2 - name: Start Keycloak with Backup @@ -413,9 +391,7 @@ jobs: - name: checkout uses: actions/checkout@v4 - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v11 - - name: Nix Cache - uses: DeterminateSystems/magic-nix-cache-action@v6 + uses: DeterminateSystems/nix-installer-action@v17 - name: Rust Cache uses: Swatinem/rust-cache@v2 - name: Run doc tests @@ -430,9 +406,7 @@ jobs: - name: checkout uses: actions/checkout@v4 - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v11 - - name: Nix Cache - uses: DeterminateSystems/magic-nix-cache-action@v6 + uses: DeterminateSystems/nix-installer-action@v17 - name: Rust Cache uses: Swatinem/rust-cache@v2 - name: Check docs with strict warnings diff --git a/.github/workflows/nutshell_itest.yml b/.github/workflows/nutshell_itest.yml index 220ff41a..1f859f2e 100644 --- a/.github/workflows/nutshell_itest.yml +++ b/.github/workflows/nutshell_itest.yml @@ -6,13 +6,12 @@ jobs: nutshell-integration-tests: name: Nutshell Mint Integration Tests runs-on: ubuntu-latest + timeout-minutes: 15 steps: - name: checkout uses: actions/checkout@v4 - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v11 - - name: Nix Cache - uses: DeterminateSystems/magic-nix-cache-action@v6 + uses: DeterminateSystems/nix-installer-action@v17 - name: Rust Cache uses: Swatinem/rust-cache@v2 - name: Test Nutshell @@ -24,15 +23,14 @@ jobs: nutshell-wallet-integration-tests: name: Nutshell Wallet Integration Tests runs-on: ubuntu-latest + timeout-minutes: 15 steps: - name: checkout uses: actions/checkout@v4 - name: Pull Nutshell Docker image run: docker pull cashubtc/nutshell:latest - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v11 - - name: Nix Cache - uses: DeterminateSystems/magic-nix-cache-action@v6 + uses: DeterminateSystems/nix-installer-action@v17 - name: Rust Cache uses: Swatinem/rust-cache@v2 - name: Test Nutshell Wallet @@ -40,4 +38,4 @@ jobs: nix develop -i -L .#integration --command just nutshell-wallet-itest - name: Show Docker logs if tests fail if: failure() - run: docker logs nutshell-wallet || true + run: docker logs nutshell-wallet || true \ No newline at end of file diff --git a/flake.lock b/flake.lock index f3136ec7..eae2a862 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1746291859, - "narHash": "sha256-DdWJLA+D5tcmrRSg5Y7tp/qWaD05ATI4Z7h22gd1h7Q=", + "lastModified": 1748047550, + "narHash": "sha256-t0qLLqb4C1rdtiY8IFRH5KIapTY/n3Lqt57AmxEv9mk=", "owner": "ipetkov", "repo": "crane", - "rev": "dfd9a8dfd09db9aad544c4d3b6c47b12562544a5", + "rev": "b718a78696060df6280196a6f992d04c87a16aef", "type": "github" }, "original": { @@ -23,11 +23,11 @@ "rust-analyzer-src": [] }, "locked": { - "lastModified": 1747118403, - "narHash": "sha256-6LDKrSTxPmh9c1f79ixqIwg6mlXE2FKwi11x9GNPKhA=", + "lastModified": 1748327829, + "narHash": "sha256-TJwbWCsyT9yJkBRTnqKE/YDTiXuEdYHb37WLK4TcAwE=", "owner": "nix-community", "repo": "fenix", - "rev": "01daa5be6a29caab8b6831b0e936750ea66d463d", + "rev": "26fbcc33a5e94d6d0dc5f467eca8f7a746a54e6c", "type": "github" }, "original": { @@ -93,16 +93,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746957726, - "narHash": "sha256-k9ut1LSfHCr0AW82ttEQzXVCqmyWVA5+SHJkS5ID/Jo=", + "lastModified": 1748162331, + "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a39ed32a651fdee6842ec930761e31d1f242cb94", + "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -130,11 +130,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1746537231, - "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", + "lastModified": 1747372754, + "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", + "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", "type": "github" }, "original": { @@ -160,11 +160,11 @@ ] }, "locked": { - "lastModified": 1747103809, - "narHash": "sha256-a3Yk+CoFmNw7V8J/si/AM8WuI/qTxQhiJpuQ7HFl774=", + "lastModified": 1748313401, + "narHash": "sha256-x5UuDKP2Ui/TresAngUo9U4Ss9xfOmN8dAXU8OrkZmA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "fe36c63649875f391949e8b2ec33949d0cd8aa95", + "rev": "9c8ea175cf9af29edbcff121512e44092a8f37e4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 829ae47a..59fc1834 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "CDK Flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; rust-overlay = { url = "github:oxalica/rust-overlay";