diff --git a/.github/workflows/rust_tests.yml b/.github/workflows/rust_tests.yml index 5622d80f..a27e53cb 100644 --- a/.github/workflows/rust_tests.yml +++ b/.github/workflows/rust_tests.yml @@ -76,7 +76,7 @@ jobs: with: command: build toolchain: ${{ matrix.toolchain }} - args: --target ${{ matrix.target }} --features vendored --workspace + args: --target ${{ matrix.target }} --workspace env: CC: musl-gcc CXX: g++ @@ -86,7 +86,7 @@ jobs: with: command: test toolchain: ${{ matrix.toolchain }} - args: --target ${{ matrix.target }} --features vendored --workspace + args: --target ${{ matrix.target }} --workspace env: CC: musl-gcc CXX: g++ @@ -98,7 +98,7 @@ jobs: with: command: build toolchain: ${{ matrix.toolchain }} - args: --target wasm32-unknown-unknown --features vendored --package cloudevents-sdk --package cloudevents-sdk-reqwest + args: --target wasm32-unknown-unknown --package cloudevents-sdk --package cloudevents-sdk-reqwest # Build examples - uses: actions-rs/cargo@v1 @@ -107,7 +107,7 @@ jobs: with: command: build toolchain: ${{ matrix.toolchain }} - args: --target ${{ matrix.target }} --features vendored --manifest-path ./example-projects/reqwest-wasm-example/Cargo.toml + args: --target ${{ matrix.target }} --manifest-path ./example-projects/reqwest-wasm-example/Cargo.toml - uses: actions-rs/cargo@v1 name: "Build rdkafka-example" diff --git a/Cargo.toml b/Cargo.toml index 8793bd5a..fcc8c5fd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,11 +24,12 @@ delegate-attr = "^0.2" base64 = "^0.12" url = { version = "^2.1", features = ["serde"] } snafu = "^0.6" -openssl-sys = "*" bitflags = "^1.2" [target."cfg(not(target_arch = \"wasm32\"))".dependencies] hostname = "^0.3" +openssl-sys = "*" +openssl = { version = "*", features = ["vendored"] } uuid = { version = "^0.8", features = ["v4"] } [target.'cfg(target_arch = "wasm32")'.dependencies] @@ -41,9 +42,6 @@ claim = "0.3.1" version-sync = "^0.9" serde_yaml = "0.8" -[features] -vendored = ["openssl-sys/vendored"] - [workspace] members = [ ".",