From 40e44b212e0f657c11964e5a8a6841de38e8364a Mon Sep 17 00:00:00 2001 From: serendipity-crypto Date: Mon, 5 Aug 2024 19:10:53 +0800 Subject: [PATCH 1/4] enable more actions for check --- .github/workflows/rust.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 90dd7026..a3e2b553 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -53,8 +53,8 @@ jobs: test: strategy: matrix: - # os: [ubuntu-latest, windows-latest, macos-latest] - os: [ubuntu-latest] + os: [ubuntu-latest, windows-latest, macos-latest] + # os: [ubuntu-latest] name: Test runs-on: ${{ matrix.os }} steps: @@ -74,9 +74,9 @@ jobs: target: x86_64-unknown-linux-gnu command: build - # - os: windows-latest - # target: x86_64-pc-windows-msvc - # command: build + - os: windows-latest + target: x86_64-pc-windows-msvc + command: build # - os: macos-latest # target: x86_64-apple-darwin From d40de5c0f2d06930089c26166652c1c5c720baf8 Mon Sep 17 00:00:00 2001 From: serendipity-crypto Date: Mon, 5 Aug 2024 19:15:26 +0800 Subject: [PATCH 2/4] disable `asm` feature for `sha2` --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 58d81605..96f300f3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -25,7 +25,7 @@ merlin = { version = "3.0.0", default-features = false } serde = { version = "1.0", features = ["derive"] } bincode = "1.3" itertools = "0.13.0" -sha2 = { version = "0.10.7", features = ["asm"] } +sha2 = { version = "0.10.8" } criterion = "0.4" From 0898fc404fa62a862b23d6cca275cf89179cdd41 Mon Sep 17 00:00:00 2001 From: serendipity-crypto Date: Mon, 5 Aug 2024 19:20:23 +0800 Subject: [PATCH 3/4] update `bytemuck` and `criterion` --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 96f300f3..52d42f50 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,14 +20,14 @@ rand = "0.8" rand_distr = "0.4" rand_core = "0.6.4" rayon = "1" -bytemuck = { version = "1.13", features = ["derive"] } +bytemuck = { version = "1.16", features = ["derive"] } merlin = { version = "3.0.0", default-features = false } serde = { version = "1.0", features = ["derive"] } bincode = "1.3" itertools = "0.13.0" sha2 = { version = "0.10.8" } -criterion = "0.4" +criterion = "0.5" [profile.bench] lto = true From c1f6f02509f2b8e42303587093857f48eba563d6 Mon Sep 17 00:00:00 2001 From: serendipity-crypto Date: Mon, 5 Aug 2024 19:56:14 +0800 Subject: [PATCH 4/4] cfg `sha2` --- pcs/Cargo.toml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pcs/Cargo.toml b/pcs/Cargo.toml index 35c3727c..c632019f 100644 --- a/pcs/Cargo.toml +++ b/pcs/Cargo.toml @@ -17,6 +17,14 @@ serde = { workspace = true } bincode = { workspace = true } itertools = { workspace = true } rayon = { workspace = true } + +[target.'cfg(all(unix, any(target_arch = "x86_64", target_arch = "x86", target_arch = "aarch64")))'.dependencies] +sha2 = { workspace = true, features = ["asm"] } + +[target.'cfg(all(target_os = "windows", target_arch = "x86_64", target_env = "gnu"))'.dependencies] +sha2 = { workspace = true, features = ["asm"] } + +[target.'cfg(all(target_os = "windows", target_env = "msvc"))'.dependencies] sha2 = { workspace = true } [dev-dependencies]