From 8a96ee5da3c739bb8070a725bae7391ebc1147c2 Mon Sep 17 00:00:00 2001 From: Sebb Date: Tue, 14 Nov 2023 12:29:36 +0000 Subject: [PATCH] Force JNA to fail if testing JNI and vice-versa [skip ci] --- .github/workflows/maven.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 50c91fcc9..46b7bf842 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -129,7 +129,7 @@ jobs: - name: Check JNI and JNA tests are independent # N.B. the default library fails with 'java is loading libcrypto in an unsafe way' # so we need to define the appropriate library for each test - if: ${{ matrix.java == '8' && matrix.os == 'ubuntu-20.04' }} + if: ${{ matrix.java == '8' && matrix.os != 'windows-latest' }} run: | - mvn -V -B -ntp test -Ptestjni -D"jni.library.path=$ENGINESDIR" - mvn -V -B -ntp test -Ptestjna -D"jna.library.path=$ENGINESDIR" + mvn -V -B -ntp test -Ptestjni -D"jni.library.path=$ENGINESDIR" -Dcommons.crypto.OpenSslNativeJna=___ + mvn -V -B -ntp test -Ptestjna -D"jna.library.path=$ENGINESDIR" -Djni.library.name=___