(commons-crypto) branch master updated: Try macos and ubuntu latest

[sebb]

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 d02f448d Try macos and ubuntu latest
d02f448d is described below

commit d02f448d3780de086465bb7c2808f40404c040fe
Author: Sebb <s...@apache.org>
AuthorDate: Wed Nov 8 23:56:18 2023 +0000

    Try macos and ubuntu latest
---
 .github/workflows/maven_adhoc.yml | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/maven_adhoc.yml 
b/.github/workflows/maven_adhoc.yml
index 4ffa1c61..15e9d4f0 100644
--- a/.github/workflows/maven_adhoc.yml
+++ b/.github/workflows/maven_adhoc.yml
@@ -35,22 +35,15 @@ jobs:
       matrix:
         # macos-latest and ubuntu-latest uses OpenSSL 3 which breaks tests
         # os: [macos-11, ubuntu-20.04, windows-latest]
-        os: [ windows-latest ]
+        os: [ macos-latest, ubuntu-latest ]
         # These names are used in conditional statements below.
         # java: [ 8, 11, 17, 21 ]
         java: [ 8 ]
         experimental: [false]
 
     steps:
-    - name: Search
-      run: |
-        dir "C:\Program Files"
-        dir "C:\Program Files\OpenSSL"
-        dir "C:\Program Files\OpenSSL\lib"
-        dir "C:\Windows\SYSTEM32"
     - name: OpenSSL version
       run: openssl version -a
-      #  Get-Childitem –Path "C:\Program Files"  -File -Include libcrypto* 
-Recurse -ErrorAction SilentlyContinue
     - name: Checkout
       uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       with:
@@ -65,19 +58,19 @@ jobs:
         OPENSSL_HOME: "C:\\Miniconda\\Library"
         NAME: "libcrypto-1_1-x64"
       run: |
-        mvn clean test -B -V -ntp -D"jna.debug_load=true" 
-DtrimStackTrace=false -D"jni.library.name=$env:NAME" 
-D"commons.crypto.OpenSslNativeJna=$env:NAME" -D"commons.crypto.debug=true"
-    - name: JNA test
-      if: always()
-      env:
-        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:
-        NAME: "libcrypto-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"
+        mvn clean test -B -V -ntp -D"jna.debug_load=true" 
-DtrimStackTrace=false -D"commons.crypto.debug=true"
+    # - name: JNA test
+    #   if: always()
+    #   env:
+    #     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:
+    #     NAME: "libcrypto-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"
     - name: JNI test default
       if: always()
       run: |