This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-crypto.git
The following commit(s) were added to refs/heads/master by this push: new 7a3632aa Tidy up library defines 7a3632aa is described below commit 7a3632aac4f6c85adc9112c49e9a79170a5c0f8b Author: Sebb <s...@apache.org> AuthorDate: Wed Nov 1 17:46:18 2023 +0000 Tidy up library defines --- .github/workflows/maven.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 447c496d..bdd48d8d 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -112,20 +112,22 @@ jobs: OPENSSL_HOME: "C:\\Miniconda\\Library" run: | mvn --show-version --batch-mode --no-transfer-progress -DtrimStackTrace=false -D"jni.library.path=$ENGINESDIR" -D"jna.library.path=$ENGINESDIR" - - name: Run Crypto (JNI) + - name: Run Crypto (JNI - override default lib) + shell: bash run: | - mvn --show-version --batch-mode --no-transfer-progress -q exec:java -D"exec.mainClass=org.apache.commons.crypto.Crypto" -D"commons.crypto.debug=true" + mvn --show-version --batch-mode --no-transfer-progress -q exec:java -D"exec.mainClass=org.apache.commons.crypto.Crypto" -D"commons.crypto.debug=true" -D"jni.library.path=$ENGINESDIR" - name: Run OpenSslJna (JNA - don't override lib) run: | mvn --show-version --batch-mode --no-transfer-progress -q exec:java -D"exec.mainClass=org.apache.commons.crypto.jna.OpenSslJna" -D"commons.crypto.debug=true" - name: Run OpenSslJna (JNA - macOS from openssl version -a ENGINESDIR) if: ${{ matrix.os == 'macos-11' }} run: | - mvn --show-version --batch-mode --no-transfer-progress -q exec:java -D"exec.mainClass=org.apache.commons.crypto.jna.OpenSslJna" -D"jna.library.path=/usr/local/Cellar/openssl@1.1/1.1.1v/lib" -D"commons.crypto.debug=true" + mvn --show-version --batch-mode --no-transfer-progress -q exec:java -D"exec.mainClass=org.apache.commons.crypto.jna.OpenSslJna" -D"jna.library.path=$ENGINESDIR" -D"commons.crypto.debug=true" - name: Run OpenSslJna (JNA - Windows from openssl version -a ENGINESDIR) if: ${{ matrix.os == 'windows-latest' }} + shell: bash run: | - mvn --show-version --batch-mode --no-transfer-progress -q exec:java -D"exec.mainClass=org.apache.commons.crypto.jna.OpenSslJna" -D"jna.library.path=C:\Program Files\OpenSSL\lib" -D"commons.crypto.debug=true" + mvn --show-version --batch-mode --no-transfer-progress -q exec:java -D"exec.mainClass=org.apache.commons.crypto.jna.OpenSslJna" -D"jna.library.path=$ENGINESDIR" -D"commons.crypto.debug=true" - name: Check benchmark code compiles if: ${{ matrix.java == '8' }} env: