diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8b8ab2f4..3a7f3fbd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,8 +39,12 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 + - name: Install Nix uses: determinateSystems/nix-installer-action@v12 - uses: DeterminateSystems/magic-nix-cache-action@v7 - uses: DeterminateSystems/flake-checker-action@v8 - - run: nix-shell --run "make test-${{matrix.test-vector}}" \ No newline at end of file + if: ${{ matrix.test-vector == 'bitcoin-cln' }} + + - name: Run integration tests + run: nix-shell --run "make test-${{matrix.test-vector}}" \ No newline at end of file diff --git a/flake.lock b/flake.lock index 3a661310..6d8b32df 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1719685792, - "narHash": "sha256-WIoVERD4AN6CmfGSRPy3mfPx2dDbRHgzP2V8z6aNbaY=", + "lastModified": 1713979152, + "narHash": "sha256-apdecPuh8SOQnkEET/kW/UcfjCRb8JbV5BKjoH+DcP4=", "owner": "ipetkov", "repo": "crane", - "rev": "aa5dcd0518a422dfd545d565f0d5a25971fea52a", + "rev": "a5eca68a2cf11adb32787fc141cddd29ac8eb79c", "type": "github" }, "original": { @@ -102,17 +102,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711719691, - "narHash": "sha256-o/yHbl1XlgdhwBWCde6ch4OyJnI0qkBvXVEo0ZBerFc=", + "lastModified": 1717967265, + "narHash": "sha256-CSRYYSqLrcNuiCFwybXAXAfjprvhvFoRtmdCEwVleZU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f54322490f509985fa8be4ac9304f368bd8ab924", + "rev": "755b915a158c9d588f08e9b08da9f7f3422070cc", "type": "github" }, "original": { "owner": "NixOS", "repo": "nixpkgs", - "rev": "f54322490f509985fa8be4ac9304f368bd8ab924", + "rev": "755b915a158c9d588f08e9b08da9f7f3422070cc", "type": "github" } }, @@ -176,17 +176,21 @@ }, "rust-overlay": { "inputs": { + "flake-utils": [ + "lwk-flake", + "flake-utils" + ], "nixpkgs": [ "lwk-flake", "nixpkgs" ] }, "locked": { - "lastModified": 1719627476, - "narHash": "sha256-LBfULF+2sCaWmkjmj1LkkGrAS/E9ZdXU1A5wWKjt9p0=", + "lastModified": 1714356894, + "narHash": "sha256-W6Mss7AG6bnFT1BqRApHXvLXBrFOu7V0+EUe9iML30s=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5be53be9e5c766fc72fc5d65ba8a566cc0c3217f", + "rev": "d9b44509b4064f0a3fc9c7c92a603861f52fbedc", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index a245d756..c1ba2431 100644 --- a/flake.nix +++ b/flake.nix @@ -33,6 +33,8 @@ blockstream-electrs = pkgs2.blockstream-electrs.overrideAttrs (oldAttrs: { cargoBuildFlags = [ "--features liquid" "--bin electrs" ]; }); + # Override priority for bitcoin as /bin/bitcoin_test will + # confilict with /bin/bitcoin_test from elementsd. bitcoind = pkgs.bitcoind.overrideAttrs (attrs: { meta = attrs.meta or { } // { priority = 0; }; });