From 9f80c2c58714880da628460f3382dcf70d834533 Mon Sep 17 00:00:00 2001 From: Shinya Watanabe Date: Tue, 27 Jan 2026 21:45:48 +0900 Subject: [PATCH 1/4] ci: bring back bare metal OS builds --- .github/workflows/rustls-rustcrypto.yml | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/.github/workflows/rustls-rustcrypto.yml b/.github/workflows/rustls-rustcrypto.yml index 576d748..b2b3936 100644 --- a/.github/workflows/rustls-rustcrypto.yml +++ b/.github/workflows/rustls-rustcrypto.yml @@ -54,8 +54,26 @@ jobs: - 1.85.0 # MSRV - stable target: - # - armv7a-none-eabi - # - thumbv7em-none-eabi + - armv7a-none-eabi # Actually requires a custom backend + - thumbv7em-none-eabi # Actually requires a custom backend + steps: + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@master + with: + toolchain: ${{ matrix.rust }} + targets: ${{ matrix.target }} + - env: + RUSTFLAGS: --cfg getrandom_backend="unsupported" + run: cargo build --no-default-features --features tls12,alloc --release --target ${{ matrix.target }} + + wasm_js: + runs-on: ubuntu-latest + strategy: + matrix: + rust: + - 1.85.0 # MSRV + - stable + target: - wasm32-unknown-unknown steps: - uses: actions/checkout@v4 From 60d69e862d4e88e3b88a5efb9cf2c61f8aaeac23 Mon Sep 17 00:00:00 2001 From: Shinya Watanabe Date: Tue, 27 Jan 2026 22:52:13 +0900 Subject: [PATCH 2/4] specifying wasm_js in CI --- .github/workflows/rustls-rustcrypto.yml | 2 +- Cargo.lock | 69 ------------------------- Cargo.toml | 3 -- 3 files changed, 1 insertion(+), 73 deletions(-) diff --git a/.github/workflows/rustls-rustcrypto.yml b/.github/workflows/rustls-rustcrypto.yml index b2b3936..46b19ca 100644 --- a/.github/workflows/rustls-rustcrypto.yml +++ b/.github/workflows/rustls-rustcrypto.yml @@ -81,7 +81,7 @@ jobs: with: toolchain: ${{ matrix.rust }} targets: ${{ matrix.target }} - - run: cargo build --no-default-features --features tls12,alloc --release --target ${{ matrix.target }} + - run: cargo build --no-default-features --features tls12,alloc,wasm_js --release --target ${{ matrix.target }} test: strategy: diff --git a/Cargo.lock b/Cargo.lock index d2e136d..0c6f1b0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -76,12 +76,6 @@ dependencies = [ "hybrid-array", ] -[[package]] -name = "bumpalo" -version = "3.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510" - [[package]] name = "cc" version = "1.2.54" @@ -368,13 +362,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74f70a332ddf75e5e5e43284304179ba02f391f82f692f030b08a8378adf3c99" dependencies = [ "cfg-if", - "js-sys", "libc", "r-efi", "rand_core", "wasip2", "wasip3", - "wasm-bindgen", ] [[package]] @@ -469,16 +461,6 @@ version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92ecc6618181def0457392ccd0ee51198e065e016d1d527a7ac1b6dc7c1f09d2" -[[package]] -name = "js-sys" -version = "0.3.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3" -dependencies = [ - "once_cell", - "wasm-bindgen", -] - [[package]] name = "leb128fmt" version = "0.1.0" @@ -804,12 +786,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "rustversion" -version = "1.0.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" - [[package]] name = "sec1" version = "0.8.0-rc.13" @@ -994,51 +970,6 @@ dependencies = [ "wit-bindgen 0.48.1", ] -[[package]] -name = "wasm-bindgen" -version = "0.2.108" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566" -dependencies = [ - "cfg-if", - "once_cell", - "rustversion", - "wasm-bindgen-macro", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.108" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.108" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55" -dependencies = [ - "bumpalo", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.108" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12" -dependencies = [ - "unicode-ident", -] - [[package]] name = "wasm-encoder" version = "0.241.2" diff --git a/Cargo.toml b/Cargo.toml index c73a755..39a6343 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,9 +40,6 @@ sha2 = { version = "=0.11.0-rc.4", default-features = false } signature = { version = "3.0.0-rc.9", default-features = false } x25519-dalek = { version = "3.0.0-pre.5", default-features = false } -[target.'cfg(target_arch = "wasm32")'.dependencies] -getrandom = { version = "=0.4.0-rc.1", default-features = false, features = ["wasm_js"] } - [features] default = ["std", "tls12", "zeroize"] logging = ["rustls/logging"] From 95321570878344764bbcdf0fddd0959fae95eb8e Mon Sep 17 00:00:00 2001 From: Shinya Watanabe Date: Tue, 27 Jan 2026 23:04:51 +0900 Subject: [PATCH 3/4] fix --- .github/workflows/rustls-rustcrypto.yml | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/.github/workflows/rustls-rustcrypto.yml b/.github/workflows/rustls-rustcrypto.yml index 46b19ca..47871f1 100644 --- a/.github/workflows/rustls-rustcrypto.yml +++ b/.github/workflows/rustls-rustcrypto.yml @@ -56,6 +56,7 @@ jobs: target: - armv7a-none-eabi # Actually requires a custom backend - thumbv7em-none-eabi # Actually requires a custom backend + - wasm32-unknown-unknown # Actually requires a wasm_js feature steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@master @@ -66,23 +67,6 @@ jobs: RUSTFLAGS: --cfg getrandom_backend="unsupported" run: cargo build --no-default-features --features tls12,alloc --release --target ${{ matrix.target }} - wasm_js: - runs-on: ubuntu-latest - strategy: - matrix: - rust: - - 1.85.0 # MSRV - - stable - target: - - wasm32-unknown-unknown - steps: - - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@master - with: - toolchain: ${{ matrix.rust }} - targets: ${{ matrix.target }} - - run: cargo build --no-default-features --features tls12,alloc,wasm_js --release --target ${{ matrix.target }} - test: strategy: matrix: From 882a5aa62574886edcdaea02a05da8c34dc5c0b9 Mon Sep 17 00:00:00 2001 From: Shinya Watanabe Date: Tue, 27 Jan 2026 23:08:19 +0900 Subject: [PATCH 4/4] Remove the comments --- .github/workflows/rustls-rustcrypto.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/rustls-rustcrypto.yml b/.github/workflows/rustls-rustcrypto.yml index 47871f1..539c907 100644 --- a/.github/workflows/rustls-rustcrypto.yml +++ b/.github/workflows/rustls-rustcrypto.yml @@ -54,9 +54,9 @@ jobs: - 1.85.0 # MSRV - stable target: - - armv7a-none-eabi # Actually requires a custom backend - - thumbv7em-none-eabi # Actually requires a custom backend - - wasm32-unknown-unknown # Actually requires a wasm_js feature + - armv7a-none-eabi + - thumbv7em-none-eabi + - wasm32-unknown-unknown steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@master