From 64a7567928459587ec7f333a9b11c5640e0be3cd Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Mon, 27 Feb 2023 17:32:07 +0000 Subject: [PATCH] Move `lightning-transaction-sync` out of the main workspace Because `lightning-transaction-sync` does not have an MSRV (and because its dev-dependencies are huge), we can't build it by default when devs run `cargo test`, so it is moved out of the top-level workspace. --- .github/workflows/build.yml | 10 +++++----- Cargo.toml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d66498d48..9fb37f1b4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -86,10 +86,10 @@ jobs: run: cargo update -p tokio --precise "1.14.0" --verbose env: CARGO_NET_GIT_FETCH_WITH_CLI: "true" - - name: Build on Rust ${{ matrix.toolchain }} with net-tokio and tx-sync - if: "matrix.build-net-tokio && !matrix.coverage && matrix.build-tx-sync" + - name: Build on Rust ${{ matrix.toolchain }} with net-tokio + if: "matrix.build-net-tokio && !matrix.coverage" run: cargo build --verbose --color always - - name: Build on Rust ${{ matrix.toolchain }} with net-tokio, tx-sync, and full code-linking for coverage generation + - name: Build on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation if: matrix.coverage run: RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always - name: Build on Rust ${{ matrix.toolchain }} @@ -144,9 +144,9 @@ jobs: run: | cd lightning && cargo test --verbose --color always --features backtrace - name: Test on Rust ${{ matrix.toolchain }} with net-tokio - if: "matrix.build-net-tokio && !matrix.coverage && matrix.build-tx-sync" + if: "matrix.build-net-tokio && !matrix.coverage" run: cargo test --verbose --color always - - name: Test on Rust ${{ matrix.toolchain }} with net-tokio, tx-sync, and full code-linking for coverage generation + - name: Test on Rust ${{ matrix.toolchain }} with net-tokio, and full code-linking for coverage generation if: matrix.coverage run: RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always - name: Test no-std builds on Rust ${{ matrix.toolchain }} diff --git a/Cargo.toml b/Cargo.toml index be76477f4..5412c496e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,6 @@ members = [ "lightning", "lightning-block-sync", - "lightning-transaction-sync", "lightning-invoice", "lightning-net-tokio", "lightning-persister", @@ -13,6 +12,7 @@ members = [ exclude = [ "lightning-custom-message", + "lightning-transaction-sync", "no-std-check", ] -- 2.39.5