Fix up overrides

apache · Nov 6, 2023 · 687d9eb · 687d9eb
1 parent 1d1ac74
commit 687d9eb
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/.github/workflows/maven_adhoc.yml b/.github/workflows/maven_adhoc.yml
@@ -63,21 +63,18 @@ jobs:
     - name: Build with Maven
       env:
         OPENSSL_HOME: "C:\\Miniconda\\Library"
-        LIB: "C:\\Program Files\\OpenSSL\\lib"
-        NAME: "libcrypto-1_1-x64.dll"
+        NAME: "crypto-1_1-x64"
       run: |
-        mvn clean test -B -V -ntp -D"jna.debug_load=true" -DtrimStackTrace=false -D"jni.library.name=$env:NAME" -D"jna.library.path=$env:LIB" -D"commons.crypto.openssl.check=skip" -D"commons.crypto.debug=true"
+        mvn clean test -B -V -ntp -D"jna.debug_load=true" -DtrimStackTrace=false -D"jni.library.name=$env:NAME" -D"commons.crypto.OpenSslJna=$env:NAME" -D"commons.crypto.openssl.check=skip" -D"commons.crypto.debug=true"
     - name: JNA test
       if: always()
       env:
-        LIB: "C:\\Program Files\\OpenSSL\\lib"
         NAME: "crypto-1_1-x64"
       run: |
         mvn -q exec:java -D"jna.debug_load=true" -D"exec.mainClass=org.apache.commons.crypto.jna.OpenSslJna" -D"commons.crypto.debug=true" -D"commons.crypto.OpenSslNativeJna=$env:NAME"
     - name: JNI test
       if: always()
       env:
-        LIB: "C:\\Program Files\\OpenSSL\\lib"
-        NAME: "libcrypto-1_1-x64.dll"
+        NAME: "crypto-1_1-x64"
       run: |
         mvn -q exec:java -D"exec.mainClass=org.apache.commons.crypto.Crypto" -D"commons.crypto.debug=true" -D"jni.library.name=$env:NAME"