From 4f76dea3902e9240e70797e56d8a037b33e59959 Mon Sep 17 00:00:00 2001 From: Anatoly Bugakov Date: Fri, 15 Dec 2023 09:39:34 +0000 Subject: [PATCH 1/9] windows openssl --- .github/workflows/publish-python.yml | 2 +- .github/workflows/test-python.yaml | 13 +++++++++++++ pyultima/Cargo.toml | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-python.yml b/.github/workflows/publish-python.yml index dea7395..194f35c 100644 --- 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' diff --git a/.github/workflows/test-python.yaml b/.github/workflows/test-python.yaml index eb4bfde..839380e 100644 --- a/.github/workflows/test-python.yaml +++ b/.github/workflows/test-python.yaml @@ -118,6 +118,19 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Set up OpenSSL + working-directory: frontend + run: | + git clone https://github.com/microsoft/vcpkg + cd vcpkg + vcpkg\bootstrap-vcpkg.bat + vcpkg\vcpkg install openssl:x64-windows-static + mkdir "C:\Program Files\OpenSSL-Win64\certs" + curl --remote-name --time-cond "C:\Program Files\OpenSSL-Win64\certs\cacert.pem" -o "C:\Program Files\OpenSSL-Win64\certs\cacert.pem" https://curl.se/ca/cacert.pem + set OPENSSL_NO_VENDOR=1 + set RUSTFLAGS=-Ctarget-feature=+crt-static + set SSL_CERT_FILE=C:\OpenSSL-Win64\certs\cacert.pem + - name: Set up Python uses: actions/setup-python@v4 with: diff --git a/pyultima/Cargo.toml b/pyultima/Cargo.toml index c4a552c..955aa19 100644 --- 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} From e534dd613a4b92d0086cca79cc3c24cc130c0a72 Mon Sep 17 00:00:00 2001 From: Anatoly Bugakov Date: Fri, 15 Dec 2023 12:02:48 +0000 Subject: [PATCH 2/9] vcpkg win --- .github/workflows/test-python.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-python.yaml b/.github/workflows/test-python.yaml index 839380e..253ebbc 100644 --- a/.github/workflows/test-python.yaml +++ b/.github/workflows/test-python.yaml @@ -123,8 +123,8 @@ jobs: run: | git clone https://github.com/microsoft/vcpkg cd vcpkg - vcpkg\bootstrap-vcpkg.bat - vcpkg\vcpkg install openssl:x64-windows-static + .\bootstrap-vcpkg.bat + .\vcpkg install openssl:x64-windows-static mkdir "C:\Program Files\OpenSSL-Win64\certs" curl --remote-name --time-cond "C:\Program Files\OpenSSL-Win64\certs\cacert.pem" -o "C:\Program Files\OpenSSL-Win64\certs\cacert.pem" https://curl.se/ca/cacert.pem set OPENSSL_NO_VENDOR=1 From 7d96b63744d2b019220029f4d875bf4fcdcc20ce Mon Sep 17 00:00:00 2001 From: Anatoly Bugakov Date: Wed, 20 Dec 2023 15:35:53 +0000 Subject: [PATCH 3/9] trying to install vcpkg on windows --- .github/workflows/test-python.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-python.yaml b/.github/workflows/test-python.yaml index 253ebbc..1222c21 100644 --- a/.github/workflows/test-python.yaml +++ b/.github/workflows/test-python.yaml @@ -114,12 +114,17 @@ jobs: fail-fast: false matrix: python-version: ['3.9', '3.11'] + env: + OPENSSL_NO_VENDOR: 1 + RUSTFLAGS: -Ctarget-feature=+crt-static + SSL_CERT_FILE: C:\OpenSSL-Win64\certs\cacert.pem + OPENSSL_DIR: C:\vcpkg steps: - uses: actions/checkout@v3 - name: Set up OpenSSL - working-directory: frontend + working-directory: C run: | git clone https://github.com/microsoft/vcpkg cd vcpkg @@ -127,9 +132,6 @@ jobs: .\vcpkg install openssl:x64-windows-static mkdir "C:\Program Files\OpenSSL-Win64\certs" curl --remote-name --time-cond "C:\Program Files\OpenSSL-Win64\certs\cacert.pem" -o "C:\Program Files\OpenSSL-Win64\certs\cacert.pem" https://curl.se/ca/cacert.pem - set OPENSSL_NO_VENDOR=1 - set RUSTFLAGS=-Ctarget-feature=+crt-static - set SSL_CERT_FILE=C:\OpenSSL-Win64\certs\cacert.pem - name: Set up Python uses: actions/setup-python@v4 From 62b5cef862419b0c43d5b6a2a5b007181f767554 Mon Sep 17 00:00:00 2001 From: Anatoly Bugakov Date: Wed, 20 Dec 2023 15:45:32 +0000 Subject: [PATCH 4/9] CI openssl --- .github/workflows/test-python.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/test-python.yaml b/.github/workflows/test-python.yaml index 1222c21..07829ed 100644 --- a/.github/workflows/test-python.yaml +++ b/.github/workflows/test-python.yaml @@ -118,13 +118,11 @@ jobs: OPENSSL_NO_VENDOR: 1 RUSTFLAGS: -Ctarget-feature=+crt-static SSL_CERT_FILE: C:\OpenSSL-Win64\certs\cacert.pem - OPENSSL_DIR: C:\vcpkg steps: - uses: actions/checkout@v3 - name: Set up OpenSSL - working-directory: C run: | git clone https://github.com/microsoft/vcpkg cd vcpkg From 6c584e2f0533afa10fe216469d1fe070e2143c7f Mon Sep 17 00:00:00 2001 From: Anatoly Bugakov Date: Thu, 21 Dec 2023 15:49:30 +0000 Subject: [PATCH 5/9] openssl install windows --- .github/workflows/test-python.yaml | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test-python.yaml b/.github/workflows/test-python.yaml index 07829ed..9962a13 100644 --- a/.github/workflows/test-python.yaml +++ b/.github/workflows/test-python.yaml @@ -122,14 +122,21 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up OpenSSL + - name: Install OpenSSL (Windows) + if: runner.os == 'Windows' + shell: powershell run: | - git clone https://github.com/microsoft/vcpkg - cd vcpkg - .\bootstrap-vcpkg.bat - .\vcpkg install openssl:x64-windows-static - mkdir "C:\Program Files\OpenSSL-Win64\certs" - curl --remote-name --time-cond "C:\Program Files\OpenSSL-Win64\certs\cacert.pem" -o "C:\Program Files\OpenSSL-Win64\certs\cacert.pem" https://curl.se/ca/cacert.pem + echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append + vcpkg install openssl:x64-windows-static-md + + # - name: Set up OpenSSL + # run: | + # git clone https://github.com/microsoft/vcpkg + # cd vcpkg + # .\bootstrap-vcpkg.bat + # .\vcpkg install openssl:x64-windows-static + # mkdir "C:\Program Files\OpenSSL-Win64\certs" + # curl --remote-name --time-cond "C:\Program Files\OpenSSL-Win64\certs\cacert.pem" -o "C:\Program Files\OpenSSL-Win64\certs\cacert.pem" https://curl.se/ca/cacert.pem - name: Set up Python uses: actions/setup-python@v4 From dd9d0a011a52a68fe8b04a8e5f792517b8dd4380 Mon Sep 17 00:00:00 2001 From: Anatoly Bugakov Date: Thu, 21 Dec 2023 16:25:24 +0000 Subject: [PATCH 6/9] win openssl removing env test --- .github/workflows/test-python.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test-python.yaml b/.github/workflows/test-python.yaml index 9962a13..47fbc43 100644 --- a/.github/workflows/test-python.yaml +++ b/.github/workflows/test-python.yaml @@ -114,10 +114,10 @@ jobs: fail-fast: false matrix: python-version: ['3.9', '3.11'] - env: - OPENSSL_NO_VENDOR: 1 - RUSTFLAGS: -Ctarget-feature=+crt-static - SSL_CERT_FILE: C:\OpenSSL-Win64\certs\cacert.pem + # env: + # OPENSSL_NO_VENDOR: 1 + # RUSTFLAGS: -Ctarget-feature=+crt-static + # SSL_CERT_FILE: C:\OpenSSL-Win64\certs\cacert.pem steps: - uses: actions/checkout@v3 @@ -129,6 +129,7 @@ jobs: echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append vcpkg install openssl:x64-windows-static-md + # Not needed, above works # - name: Set up OpenSSL # run: | # git clone https://github.com/microsoft/vcpkg From 68c469aa791e54756d974dfa4f15ec5f0808068f Mon Sep 17 00:00:00 2001 From: Anatoly Bugakov Date: Thu, 21 Dec 2023 20:12:17 +0000 Subject: [PATCH 7/9] win openssl return env OPENSSL_NO_VENDOR test --- .github/workflows/test-python.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-python.yaml b/.github/workflows/test-python.yaml index 47fbc43..31011a7 100644 --- a/.github/workflows/test-python.yaml +++ b/.github/workflows/test-python.yaml @@ -114,8 +114,8 @@ jobs: fail-fast: false matrix: python-version: ['3.9', '3.11'] - # env: - # OPENSSL_NO_VENDOR: 1 + env: + OPENSSL_NO_VENDOR: 1 # RUSTFLAGS: -Ctarget-feature=+crt-static # SSL_CERT_FILE: C:\OpenSSL-Win64\certs\cacert.pem From f3dc8151dcc4a868e75c3734c689d2eda916a1b2 Mon Sep 17 00:00:00 2001 From: Anatoly Bugakov Date: Fri, 22 Dec 2023 15:01:13 +0000 Subject: [PATCH 8/9] testing no vcpkg install --- .github/workflows/test-python.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/test-python.yaml b/.github/workflows/test-python.yaml index 31011a7..444f128 100644 --- a/.github/workflows/test-python.yaml +++ b/.github/workflows/test-python.yaml @@ -116,8 +116,6 @@ jobs: python-version: ['3.9', '3.11'] env: OPENSSL_NO_VENDOR: 1 - # RUSTFLAGS: -Ctarget-feature=+crt-static - # SSL_CERT_FILE: C:\OpenSSL-Win64\certs\cacert.pem steps: - uses: actions/checkout@v3 @@ -127,7 +125,7 @@ jobs: shell: powershell run: | echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append - vcpkg install openssl:x64-windows-static-md + # vcpkg install openssl:x64-windows-static-md # Not needed, above works # - name: Set up OpenSSL From a7dfd556e72ed4e5bed22d7f49da746e28d435fd Mon Sep 17 00:00:00 2001 From: Anatoly Bugakov Date: Fri, 22 Dec 2023 15:15:00 +0000 Subject: [PATCH 9/9] CI Windows - VCPKG install --- .github/workflows/publish-python.yml | 9 +++++++++ .github/workflows/test-python.yaml | 12 +----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/publish-python.yml b/.github/workflows/publish-python.yml index 194f35c..5117ee1 100644 --- a/.github/workflows/publish-python.yml +++ b/.github/workflows/publish-python.yml @@ -136,6 +136,8 @@ jobs: fail-fast: false matrix: os: [macos-latest, windows-latest] + env: + OPENSSL_NO_VENDOR: 1 steps: - uses: actions/checkout@v3 @@ -143,6 +145,13 @@ jobs: 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 index 444f128..6348b32 100644 --- a/.github/workflows/test-python.yaml +++ b/.github/workflows/test-python.yaml @@ -125,17 +125,7 @@ jobs: shell: powershell run: | echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append - # vcpkg install openssl:x64-windows-static-md - - # Not needed, above works - # - name: Set up OpenSSL - # run: | - # git clone https://github.com/microsoft/vcpkg - # cd vcpkg - # .\bootstrap-vcpkg.bat - # .\vcpkg install openssl:x64-windows-static - # mkdir "C:\Program Files\OpenSSL-Win64\certs" - # curl --remote-name --time-cond "C:\Program Files\OpenSSL-Win64\certs\cacert.pem" -o "C:\Program Files\OpenSSL-Win64\certs\cacert.pem" https://curl.se/ca/cacert.pem + vcpkg install openssl:x64-windows-static-md - name: Set up Python uses: actions/setup-python@v4