fix: Fix openssl dependencies

kindredgroup · Sep 29, 2023 · a4eb300 · a4eb300
1 parent 3c4bc36
commit a4eb300
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 26 deletions.
diff --git a/.github/workflows/npm.yml b/.github/workflows/npm.yml
@@ -14,12 +14,12 @@ jobs:
             fail-fast: false
             matrix:
                 settings:
-                  # - host: macos-latest
-                  #   target: x86_64-apple-darwin
-                  #   jsPackageHome: packages/cohort_sdk_js
-                  #   finalPackageName: packages/cohort_sdk_js/cohort_sdk_js.darwin-x64.node
-                  #   customiseHostCommand: echo 'No customizations are needed'
-                  #   buildCommand: npm run build -- --target x86_64-apple-darwin
+                  - host: macos-latest
+                    target: x86_64-apple-darwin
+                    jsPackageHome: packages/cohort_sdk_js
+                    finalPackageName: packages/cohort_sdk_js/cohort_sdk_js.darwin-x64.node
+                    customiseHostCommand: echo 'No customizations are needed'
+                    buildCommand: npm run build -- --target x86_64-apple-darwin
 
                   - host: macos-latest
                     target: aarch64-apple-darwin
@@ -33,29 +33,27 @@ jobs:
                       EOT
                       echo "~/.cargo/config"
                       cat ~/.cargo/config
-                      echo ""
-                      brew install cyrus-sasl
                     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 customizations are needed'
-                  #   customiseHostCommand: |-
-                  #     choco install openssl --version=1.1.1.2100
-                  #     ECHO "C:\Program Files\OpenSSL\="
-                  #     ls -l "C:\\Program Files\\OpenSSL"
-                  #     setx OPENSSL_DIR "C:\\Program Files\\OpenSSL"
-                  #   buildCommand: npm run build -- --target x86_64-pc-windows-msvc
+                  - 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 customizations are needed'
+                    # customiseHostCommand: |-
+                    #   choco install openssl --version=1.1.1.2100
+                    #   ECHO "C:\Program Files\OpenSSL\="
+                    #   ls -l "C:\\Program Files\\OpenSSL"
+                    #   setx OPENSSL_DIR "C:\\Program Files\\OpenSSL"
+                    buildCommand: npm run build -- --target x86_64-pc-windows-msvc
 
-                  # - host: ubuntu-latest
-                  #   target: x86_64-unknown-linux-gnu
-                  #   jsPackageHome: packages/cohort_sdk_js
-                  #   finalPackageName: packages/cohort_sdk_js/cohort_sdk_js.linux-x64-gnu.node
-                  #   customiseHostCommand: sudo apt-get update -y && sudo apt-get install -y libsasl2-dev
-                  #   buildCommand: npm run build -- --target x86_64-unknown-linux-gnu
+                  - host: ubuntu-latest
+                    target: x86_64-unknown-linux-gnu
+                    jsPackageHome: packages/cohort_sdk_js
+                    finalPackageName: packages/cohort_sdk_js/cohort_sdk_js.linux-x64-gnu.node
+                    customiseHostCommand: sudo apt-get update -y && sudo apt-get install -y libsasl2-dev
+                    buildCommand: npm run build -- --target x86_64-unknown-linux-gnu
 
         name: stable - ${{ matrix.settings.target }} - node@16
         runs-on: ${{ matrix.settings.host }}

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/packages/cohort_sdk/Cargo.toml b/packages/cohort_sdk/Cargo.toml
@@ -15,6 +15,7 @@ opentelemetry = { version = "0.20.0" }
 rand = { version = "0.8.5" }
 
 rdkafka = { version = "0.34.0" }
+rdkafka-sys = { version = "4.6.0" }
 #rdkafka-sys = { version = "4.6.0", features = ["ssl-vendored", "gssapi-vendored"] }
 #openssl-sys = { version = "0.9", features = ["vendored"] }
 #openssl = { version = "0.10", features = ["vendored", "v111"] }

diff --git a/packages/talos_agent/Cargo.toml b/packages/talos_agent/Cargo.toml
@@ -11,6 +11,7 @@ log =           { workspace = true }
 multimap =      { version = "0.9.0" }
 
 rdkafka =       { version = "0.34.0" }
+rdkafka-sys = { version = "4.6.0" }
 #rdkafka-sys = { version = "4.6.0", features = ["ssl-vendored", "gssapi-vendored"] }
 #openssl-sys = { version = "0.9", features = ["vendored"] }
 #openssl = { version = "0.10", features = ["vendored", "v111"] }

diff --git a/packages/talos_certifier_adapters/Cargo.toml b/packages/talos_certifier_adapters/Cargo.toml
@@ -21,6 +21,7 @@ async-trait = { workspace = true }
 futures-util = "0.3.21"
 # Kafka
 rdkafka = { version = "0.34.0" }
+rdkafka-sys = { version = "4.6.0" }
 #rdkafka-sys = { version = "4.6.0", features = ["ssl-vendored", "gssapi-vendored"] }
 #openssl-sys = { version = "0.9", features = ["vendored"] }
 #openssl = { version = "0.10", features = ["vendored", "v111"] }

diff --git a/packages/talos_rdkafka_utils/Cargo.toml b/packages/talos_rdkafka_utils/Cargo.toml
@@ -22,7 +22,7 @@ mockall = "0.11.0"
 thiserror = "1.0.31"
 
 rdkafka = { version = "0.34.0" }
-#rdkafka-sys = { version = "4.6.0", features = ["ssl-vendored", "gssapi-vendored"] }
+rdkafka-sys = { version = "4.6.0" }
 #openssl-sys = { version = "0.9", features = ["vendored"] }
 #openssl = { version = "0.10", features = ["vendored", "v111"] }