From: Valentine Wallace <vwallace@protonmail.com>
Date: Thu, 17 Sep 2020 18:10:41 +0000 (-0400)
Subject: Only link dead code when necessary in CI.
X-Git-Tag: v0.0.12~23^2~2
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=b8a06d2945fb66db7ecbeb0a1eed1627f3f71aea;p=rust-lightning

Only link dead code when necessary in CI.
---

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d75607a18..292addc4d 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: |