From ea4eed7b04c4303f02b8a29daca8a2b4b2f191cb Mon Sep 17 00:00:00 2001 From: Robin Hundt <24554122+robinhundt@users.noreply.github.com> Date: Tue, 7 May 2024 17:28:29 +0200 Subject: [PATCH] Fix windows CI --- .github/workflows/pull_request.yml | 9 +++++++-- .github/workflows/push.yml | 2 -- Cargo.lock | 4 ++-- crates/seec-channel/Cargo.toml | 19 ++++++++++--------- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 9cf37d2..96489a3 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -32,11 +32,16 @@ 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 @@ -44,7 +49,7 @@ jobs: 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 index 97e89ff..93c4334 100644 --- 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 index 8a01875..5b06e9f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -245,7 +245,7 @@ dependencies = [ "bitflags 2.5.0", "cexpr", "clang-sys", - "itertools 0.12.1", + "itertools 0.10.5", "lazy_static", "lazycell", "log", @@ -1175,7 +1175,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-targets 0.52.4", + "windows-targets 0.48.5", ] [[package]] diff --git a/crates/seec-channel/Cargo.toml b/crates/seec-channel/Cargo.toml index 4e2eae8..2fba45c 100644 --- 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,18 +12,20 @@ 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" @@ -32,9 +33,9 @@ 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]]