Fix windows CI

encryptogroup · May 7, 2024 · ea4eed7 · ea4eed7
1 parent b3a35dd
commit ea4eed7
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 15 deletions.
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -32,19 +32,24 @@ jobs:
         id: toolchain
         with:
           toolchain: nightly-2024-05-03
-          # for some reason aws-lc-sys's build script needs rustfmt...
           components: "rustfmt"
       - name: Override default toolchain
         run: rustup override set ${{steps.toolchain.outputs.name}}
       - run: cargo --version
+      - name: Install NASM
+        if: ${{ matrix.os == 'windows-latest' }}
+        run: |
+          Invoke-WebRequest -Uri "https://www.nasm.us/pub/nasm/releasebuilds/2.16.03/win64/nasm-2.16.03-win64.zip" -OutFile "nasm.zip"
+          Expand-Archive -Path "nasm.zip" -DestinationPath "."
+          $env:Path += ";.\nasm-2.16.03"
       - name: Cache
         uses: Swatinem/rust-cache@v2
       - name: Run tests
         if: ${{ matrix.os == 'ubuntu-latest' }}
         run: cargo test --workspace --verbose --all-features --no-fail-fast
       - name: Run tests
         if: ${{ matrix.os != 'ubuntu-latest' }}
-        run: cargo test --workspace --verbose ${{ matrix.exclude }} --features ${{ matrix.features }}
+        run: cargo test --workspace --verbose ${{ matrix.exclude }} --no-default-features --features ${{ matrix.features }}
   lint:
     name: Lint
     runs-on: "ubuntu-latest"

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -18,8 +18,6 @@ jobs:
         id: toolchain
         with:
           toolchain: nightly-2024-05-03
-          # for some reason aws-lc-sys's build script needs rustfmt...
-          components: "rustfmt"
       - name: Override default toolchain
         run: rustup override set ${{steps.toolchain.outputs.name}}
       - run: cargo --version

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/seec-channel/Cargo.toml b/crates/seec-channel/Cargo.toml
@@ -4,7 +4,6 @@ version = "0.1.0"
 edition = "2021"
 license = "MIT"
 authors = ["Robin Hundt"]
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
@@ -13,28 +12,30 @@ async-stream = "0.3.5"
 bytes = "1.6.0"
 futures = "0.3.30"
 pin-project = "1.1.5"
-serde = { version = "1.0.197"}
+serde = { version = "1.0.197" }
 erased-serde = "0.4.4"
 thiserror = "1.0.58"
-tokio = { version = "1.36.0", features = ["macros", "net"]}
-tokio-serde = { version = "0.9.0", features = ["bincode"]}
-tokio-util = { version = "0.7.10", features = ["codec"]}
+tokio = { version = "1.36.0", features = ["macros", "net"] }
+tokio-serde = { version = "0.9.0", features = ["bincode"] }
+tokio-util = { version = "0.7.10", features = ["codec"] }
 tracing = { version = "0.1.40" }
 remoc = { workspace = true }
-seec-channel-macros = {path = "../seec-channel-macros"}
+seec-channel-macros = { path = "../seec-channel-macros" }
 once_cell = "1.19.0"
-indexmap = { version = "2.2.6", features = ["serde"]}
+indexmap = { version = "2.2.6", features = ["serde"] }
 serde_json = "1.0.114"
+# remove aws_lc_rs as default crypto provider so that we can enable the provider via a feature (see above)
+# and use ring on Windows
 tokio-rustls = "0.26.0"
 rustls = "0.23.4"
 rustls-pemfile = "2.1.1"
 rustls-native-certs = "0.7.0"
 
 [dev-dependencies]
 criterion = { version = "0.5.1", features = ["async_tokio"] }
-serde = { version = "1.0.197", features = ["derive"]}
+serde = { version = "1.0.197", features = ["derive"] }
 serde_json = "1.0.114"
-tokio = { version = "1.36.0", features = ["rt-multi-thread", "time"]}
+tokio = { version = "1.36.0", features = ["rt-multi-thread", "time"] }
 
 
 [[bench]]