Test

Signed-off-by: Alexis <[email protected]> Signed-off-by: Alexis <[email protected]>
trailofbits · Nov 4, 2024 · 4eb3e21 · 4eb3e21
1 parent 54031ab
commit 4eb3e21
Showing 1 changed file with 23 additions and 26 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -64,19 +64,19 @@ 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: Setup env variables
         shell: bash
@@ -85,17 +85,14 @@ jobs:
           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
+          cargo test --manifest-path rust/Cargo.toml 
+          # `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