From b8a06d2945fb66db7ecbeb0a1eed1627f3f71aea Mon Sep 17 00:00:00 2001 From: Valentine Wallace Date: Thu, 17 Sep 2020 14:10:41 -0400 Subject: [PATCH 1/3] Only link dead code when necessary in CI. --- .github/workflows/build.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d75607a18bc..292addc4d64 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,17 +34,23 @@ jobs: override: true profile: minimal - name: Build on Rust ${{ matrix.toolchain }} with net-tokio - if: matrix.build-net-tokio + if: "matrix.build-net-tokio && !matrix.coverage" + run: cargo build --verbose --color always + - 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 }} if: "! matrix.build-net-tokio" - run: RUSTFLAGS="-C link-dead-code" cargo build --verbose --color always -p lightning + run: cargo build --verbose --color always -p lightning - name: Test on Rust ${{ matrix.toolchain }} with net-tokio - if: matrix.build-net-tokio + if: "matrix.build-net-tokio && !matrix.coverage" + run: cargo test --verbose --color always + - 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 on Rust ${{ matrix.toolchain }} if: "! matrix.build-net-tokio" - run: RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always -p lightning + run: cargo test --verbose --color always -p lightning - name: Install deps for kcov if: matrix.coverage run: | From b0e9b0107b5b8d2dd1108c714d3befc984625a39 Mon Sep 17 00:00:00 2001 From: Valentine Wallace Date: Thu, 17 Sep 2020 14:13:12 -0400 Subject: [PATCH 2/3] Remove unnecessary include in Github Actions script. --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 292addc4d64..70cc2e48efb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,6 @@ jobs: - toolchain: 1.39.0 build-net-tokio: true coverage: true - - toolchain: 1.34.2 runs-on: ubuntu-latest steps: - name: Checkout source code From ce1f4562f581db9917cb26e589028d25a40fc793 Mon Sep 17 00:00:00 2001 From: Valentine Wallace Date: Thu, 17 Sep 2020 14:22:55 -0400 Subject: [PATCH 3/3] Update CI to run build and tests on Macos and Windows in addition to Ubuntu. We only run Macos and Windows on Rust stable, for efficient CI. --- .github/workflows/build.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 70cc2e48efb..c8cdf6660b7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,6 +6,7 @@ jobs: build: strategy: matrix: + platform: [ ubuntu-latest ] toolchain: [ stable, beta, # 1.30.0 is MSRV for Rust-Lightning @@ -17,12 +18,18 @@ jobs: include: - toolchain: stable build-net-tokio: true + - toolchain: stable + platform: macos-latest + build-net-tokio: true + - toolchain: stable + platform: windows-latest + build-net-tokio: true - toolchain: beta build-net-tokio: true - toolchain: 1.39.0 build-net-tokio: true coverage: true - runs-on: ubuntu-latest + runs-on: ${{ matrix.platform }} steps: - name: Checkout source code uses: actions/checkout@v2