diff --git a/.github/workflows/npm.yml b/.github/workflows/npm.yml index 52b3f319..1b6a8a6b 100644 --- a/.github/workflows/npm.yml +++ b/.github/workflows/npm.yml @@ -14,21 +14,24 @@ jobs: target: x86_64-apple-darwin jsPackageHome: packages/cohort_sdk_js finalPackageName: packages/cohort_sdk_js/cohort_sdk_js.darwin-x64.node - customiseHostCommand: echo 'No customisartions are needed' + customiseHostCommand: echo 'No customizations are needed' buildCommand: npm run build -- --target x86_64-apple-darwin - host: macos-latest target: aarch64-apple-darwin jsPackageHome: packages/cohort_sdk_js finalPackageName: packages/cohort_sdk_js/cohort_sdk_js.darwin-arm64.node - customiseHostCommand: echo 'No customisartions are needed' + customiseHostCommand: echo 'No customizations are needed' buildCommand: npm run build -- --target aarch64-apple-darwin - host: windows-latest target: x86_64-pc-windows-msvc jsPackageHome: packages\\cohort_sdk_js finalPackageName: packages\cohort_sdk_js\cohort_sdk_js.*.node - customiseHostCommand: ECHO 'No customisartions are needed' + # customiseHostCommand: ECHO 'No customizations are needed' + customiseHostCommand: |- + choco install openssl.light + choco install make buildCommand: npm run build -- --target x86_64-pc-windows-msvc - host: ubuntu-latest diff --git a/Cargo.lock b/Cargo.lock index 608eb961..e4db001c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -613,8 +613,6 @@ dependencies = [ "napi", "napi-build", "napi-derive", - "openssl-sys", - "sasl2-sys", "serde", "serde_json", "talos_certifier", @@ -1555,15 +1553,6 @@ version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" -[[package]] -name = "openssl-src" -version = "111.28.0+1.1.1w" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ce95ee1f6f999dfb95b8afd43ebe442758ea2104d1ccb99a94c30db22ae701f" -dependencies = [ - "cc", -] - [[package]] name = "openssl-sys" version = "0.9.91" @@ -1572,7 +1561,6 @@ checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" dependencies = [ "cc", "libc", - "openssl-src", "pkg-config", "vcpkg", ] diff --git a/packages/cohort_sdk_js/Cargo.toml b/packages/cohort_sdk_js/Cargo.toml index cb272ac9..97d161a9 100644 --- a/packages/cohort_sdk_js/Cargo.toml +++ b/packages/cohort_sdk_js/Cargo.toml @@ -21,8 +21,8 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" uuid = { version = "1", features = ["serde"] } chrono = { version = "0.4.19", features = ["serde"] } -openssl-sys = { version = "0.9", features = ["vendored"] } -sasl2-sys = { version = "0.1.20+2.1.28", features = ["vendored"] } +# openssl-sys = { version = "0.9", features = ["vendored"] } +# sasl2-sys = { version = "0.1.20+2.1.28", features = ["vendored"] } # db migrations #refinery = {version="0.8", features=["tokio-postgres"]}