Fix CI: windows-11 and codecov

cyphernet-labs · Jun 7, 2022 · efe7d8f · efe7d8f
1 parent 23b2275
commit efe7d8f
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 76 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -25,6 +25,7 @@ jobs:
           # Networking
           - tor
           - zmq
+          - tor,zmq
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies
@@ -74,33 +75,6 @@ jobs:
         with:
           command: check
           args: --all-features
-  tor:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        feature:
-          - tor
-          - tor,url
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install dependencies
-        run: sudo apt-get update && sudo apt-get install -y libzmq3-dev
-      - name: Install rust stable
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          override: true
-      - name: Feature ${{ matrix.feature }}
-        uses: actions-rs/cargo@v1
-        with:
-          command: check
-          args: --no-default-features --features=${{ matrix.feature }}
-      - name: Defaults + ${{ matrix.feature }}
-        uses: actions-rs/cargo@v1
-        with:
-          command: check
-          args: --features=${{ matrix.feature }}
   toolchains:
     runs-on: ubuntu-latest
     strategy:

diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies
-        run: sudo apt-get update && sudo apt-get install -y libzmq3-dev libssl-dev
+        run: sudo apt-get update && sudo apt-get install -y libzmq3-dev
       - name: Install latest nightly
         uses: actions-rs/toolchain@v1
         with:
@@ -28,8 +28,8 @@ jobs:
           args: --workspace --all-features --no-fail-fast
         env:
           CARGO_INCREMENTAL: '0'
-          RUSTFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off'
-          RUSTDOCFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off'
+          RUSTFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code'
+          RUSTDOCFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code'
       - id: coverage
         name: Generate coverage
         uses: actions-rs/[email protected]

diff --git a/.github/workflows/pre-publish.yml b/.github/workflows/pre-publish.yml
diff --git a/.github/workflows/publication.yml b/.github/workflows/publication.yml
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies
-        run: sudo apt-get update && sudo apt-get install -y libzmq3-dev libssl-dev
+        run: sudo apt-get update && sudo apt-get install -y libzmq3-dev
       - name: Install latest stable
         uses: actions-rs/toolchain@v1
         with:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -57,6 +57,9 @@ strict_encoding_test = "1.8.0"
 strict_encoding_derive = "1.7.6"
 compiletest_rs = "0.7.0"
 
+[target.'cfg(target_os="windows")'.build-dependencies]
+cmake = "0.1"
+
 [target.'cfg(target_os="android")'.dependencies]
 zmq = { version = "0.9", features = ["vendored"], optional = true }
 

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -0,0 +1,2 @@
+[toolchain]
+channel = "stable"