Merge pull request #180 from ultima-ib/frtb_pyengine

windows openssl
ultima-ib · Dec 22, 2023 · 535a5c9 · 535a5c9
2 parents 95344fa + a7dfd55
commit 535a5c9
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/.github/workflows/publish-python.yml b/.github/workflows/publish-python.yml
@@ -9,7 +9,7 @@ on:
       tags: ['py*.*.*'] 
 
 env:
-  RUST_TOOLCHAIN: nightly-2023-07-27
+  RUST_TOOLCHAIN: stable
   PYTHON_VERSION: '3.9'
   MATURIN_VERSION: '1.2.1'
 
@@ -136,13 +136,22 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest]
+    env:
+      OPENSSL_NO_VENDOR: 1
 
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
           python-version: ${{ env.PYTHON_VERSION }}
 
+      - name: Install OpenSSL (Windows)
+        if: runner.os == 'Windows'
+        shell: powershell
+        run: |
+          echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append
+          vcpkg install openssl:x64-windows-static-md
+
       - name: Setup node
         uses: actions/setup-node@v1
         with:

diff --git a/.github/workflows/test-python.yaml b/.github/workflows/test-python.yaml
@@ -114,10 +114,19 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ['3.9', '3.11']
+    env:
+      OPENSSL_NO_VENDOR: 1
 
     steps:
       - uses: actions/checkout@v3
 
+      - name: Install OpenSSL (Windows)
+        if: runner.os == 'Windows'
+        shell: powershell
+        run: |
+          echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append
+          vcpkg install openssl:x64-windows-static-md
+
       - name: Set up Python
         uses: actions/setup-python@v4
         with:

diff --git a/pyultima/Cargo.toml b/pyultima/Cargo.toml
@@ -16,7 +16,7 @@ name = "ultibi.rust_module.ultibi_engine"
 [dependencies]
 ultibi = { path = "../ultibi", features=["ui", "aws_s3", "db"] }
 pyo3 = { version = "0.20.0", features = ["extension-module", "abi3-py37"] }
-# openssl = { version = "0.10", features = ["vendored"] }
+openssl = { version = "0.10", features = ["vendored"] }
 polars = { workspace = true }
 frtb_engine = { path = "../frtb_engine", features=["CRR2"] }
 serde_json = {workspace = true}