diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5001aa8..ba1eff7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -64,35 +64,38 @@ jobs: - name: Install Python ${{ matrix.python }} run: uv python install ${{ matrix.python }} - - name: Install OpenSSL - env: - OPENSSL_INSTALLER: "Win64OpenSSL-3_3_2.exe" - OPENSSL_PATH: "C:\\OpenSSL-Win64" - run: | - curl.exe -o "c:\\${env:OPENSSL_INSTALLER}" -fsSL "https://slproweb.com/download/${env:OPENSSL_INSTALLER}" - Start-Process -FilePath "c:\\${env:OPENSSL_INSTALLER}" -ArgumentList "/silent /verysilent /DIR=${env:OPENSSL_PATH}" -NoNewWindow -Wait - - - name: Setup rust - uses: dtolnay/rust-toolchain@1482605bfc5719782e1267fd0c0cc350fe7646b8 - with: - components: rustfmt - toolchain: 1.81.0 +# - name: Install OpenSSL +# env: +# OPENSSL_INSTALLER: "Win64OpenSSL-3_3_2.exe" +# OPENSSL_PATH: "C:\\OpenSSL-Win64" +# run: | +# curl.exe -o "c:\\${env:OPENSSL_INSTALLER}" -fsSL "https://slproweb.com/download/${env:OPENSSL_INSTALLER}" +# Start-Process -FilePath "c:\\${env:OPENSSL_INSTALLER}" -ArgumentList "/silent /verysilent /DIR=${env:OPENSSL_PATH}" -NoNewWindow -Wait +# +# - name: Setup rust +# uses: dtolnay/rust-toolchain@1482605bfc5719782e1267fd0c0cc350fe7646b8 +# with: +# components: rustfmt +# toolchain: 1.81.0 - - name: Get env variables + - name: Setup env variables shell: bash run: | - UV_PYTHON_PATH="$(uv python dir)" - echo $UV_PYTHON_PATH - echo "PATH=$PATH:C:\Users\runneradmin\AppData\Roaming\uv\python" >> $GITHUB_ENV - echo "PYO3_PYTHON=$UV_PYTHON_PATH\python.exe" >> $GITHUB_ENV + UV_PYTHON_PATH=$(uv python dir) + export INSTALLED_PYTHON="$(find $UV_PYTHON_PATH -type d -maxdepth 1 -name '*${{ matrix.python }}*')" + echo "PATH=$PATH:$INSTALLED_PYTHON" >> $GITHUB_ENV + echo "PYO3_PYTHON=$INSTALLED_PYTHON\python.exe" >> $GITHUB_ENV + export PYO3_PYTHON="$INSTALLED_PYTHON\python.exe" + export PATH="$PATH:$INSTALLED_PYTHON" + cargo test --manifest-path rust/Cargo.toml - - name: test - run: | - env - make test INSTALL_EXTRA=test - shell: bash - env: - OPENSSL_DIR: "C:\\OpenSSL-Win64" - OPENSSL_LIB_DIR: "C:\\OpenSSL-Win64\\lib\\VC\\x64\\MD" - OPENSSL_NO_VENDOR: 1 - # PYO3_PYTHON: "$(uv python dir)\\python.exe" +# - name: test +# run: | +# env +# make test INSTALL_EXTRA=test +# shell: bash +# env: +# OPENSSL_DIR: "C:\\OpenSSL-Win64" +# OPENSSL_LIB_DIR: "C:\\OpenSSL-Win64\\lib\\VC\\x64\\MD" +# OPENSSL_NO_VENDOR: 1 +# # PYO3_PYTHON: "$(uv python dir)\\python.exe"