From 59659cc370085746b27ca86f3eb80b32e7f5d2da Mon Sep 17 00:00:00 2001
From: Sebb <sebb@apache.org>
Date: Sat, 9 Sep 2023 16:46:03 +0100
Subject: [PATCH] Try to find Windows library

---
 .github/workflows/adhoctest.yml | 110 +++++++++++++++++---------------
 1 file changed, 57 insertions(+), 53 deletions(-)

diff --git a/.github/workflows/adhoctest.yml b/.github/workflows/adhoctest.yml
index a6235aacb..609041af3 100644
--- a/.github/workflows/adhoctest.yml
+++ b/.github/workflows/adhoctest.yml
@@ -42,69 +42,73 @@ jobs:
       # commons.crypto.debug: true
     strategy:
       matrix:
-        os: [macos-latest]
-        # os: [windows-latest]
+        # os: [macos-latest]
+        os: [windows-latest]
         java: [ 8 ]
         # ref: [ 'rel/commons-crypto-1.1.0', master ]
         ref: [ master ]
       fail-fast: false
 
     steps:
-    - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
-      with:
-        persist-credentials: false
-        ref: ${{ matrix.ref }}
-    - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@v3.5.1
-      with:
-        distribution: 'temurin'
-        java-version: ${{ matrix.java }}
+    # - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+    #   with:
+    #     persist-credentials: false
+    #     ref: ${{ matrix.ref }}
+    # - name: Set up JDK ${{ matrix.java }}
+    #   uses: actions/setup-java@v3.5.1
+    #   with:
+    #     distribution: 'temurin'
+    #     java-version: ${{ matrix.java }}
     - name: OpenSSL version
       run: openssl version -a
-    - name: Compile with Maven
-      env:
-        OPENSSL_HOME: "C:\\Miniconda\\Library"
-      run: mvn -V compile -D"rat.skip" -D"animal.sniffer.skip" --no-transfer-progress -DtrimStackTrace=false
-    - name: Run sample Crypto
+    - name: Find libcrypto
       run: |
-        mvn -q exec:java -D"exec.mainClass=org.apache.commons.crypto.Crypto" -D"commons.crypto.debug=true"
-    - name: Run sample OpenSslJna (default library)
-      if: always()
-      run: |
-        mvn -q exec:java -D"exec.mainClass=org.apache.commons.crypto.jna.OpenSslJna" -D"commons.crypto.debug=true"
-    # - name: Run sample OpenSslJna
+        cd C:
+        DIR /S libcrypto.dll
+    # - name: Compile with Maven
+    #   env:
+    #     OPENSSL_HOME: "C:\\Miniconda\\Library"
+    #   run: mvn -V compile -D"rat.skip" -D"animal.sniffer.skip" --no-transfer-progress -DtrimStackTrace=false
+    # - name: Run sample Crypto
+    #   run: |
+    #     mvn -q exec:java -D"exec.mainClass=org.apache.commons.crypto.Crypto" -D"commons.crypto.debug=true"
+    # - name: Run sample OpenSslJna (default library)
     #   if: always()
     #   run: |
-    #     mvn -q exec:java -D"exec.mainClass=org.apache.commons.crypto.jna.OpenSslJna" -D"jna.library.path=C:/Miniconda/Library/bin"
-    - name: Run sample OpenSslJna (miniconda lib)
-      if: always()
-      run: |
-        mvn -q exec:java -D"exec.mainClass=org.apache.commons.crypto.jna.OpenSslJna" -D"jna.library.path=/usr/local/miniconda/lib" -D"commons.crypto.debug=true"
-    - name: Run sample OpenSslJna (Cellar lib from openssl version -a)
-      if: always()
-      run: |
-        mvn -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"
-    # - name: Find OpenSSL Mac
-    #   if: ${{ matrix.os == 'macos-latest' }}
+    #     mvn -q exec:java -D"exec.mainClass=org.apache.commons.crypto.jna.OpenSslJna" -D"commons.crypto.debug=true"
+    # # - name: Run sample OpenSslJna
+    # #   if: always()
+    # #   run: |
+    # #     mvn -q exec:java -D"exec.mainClass=org.apache.commons.crypto.jna.OpenSslJna" -D"jna.library.path=C:/Miniconda/Library/bin"
+    # - name: Run sample OpenSslJna (miniconda lib)
+    #   if: always()
     #   run: |
-    #     for i in $(which -a openssl) ; do  echo $i; $i version ; echo ""; done
-    #     set -v
-    #     find /usr/lib -name libcrypto*.dylib -ls || true
-    #     find /usr/local -name libcrypto*.dylib -ls || true
-    #     find /opt/local/lib -name libcrypto*.dylib -ls || true
-    # - name: Find OpenSSL Win
-    #   if: ${{ matrix.os == 'windows-latest' }}
+    #     mvn -q exec:java -D"exec.mainClass=org.apache.commons.crypto.jna.OpenSslJna" -D"jna.library.path=/usr/local/miniconda/lib" -D"commons.crypto.debug=true"
+    # - name: Run sample OpenSslJna (Cellar lib from openssl version -a)
+    #   if: always()
     #   run: |
-    #     where /T openssl
-    #     echo "==="
-    #     where /T libcrypto.dll
-    #     echo "==="
-    #     dir "C:\Program Files\OpenSSL\bin\"
-    #     C:
-    #     cd \
-    #     dir /s libcrypto*.dll
-    #   shell: cmd
-    - name: env sort
-      if: always()
-      run: |
-        env | sort
+    #     mvn -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"
+    # # - name: Find OpenSSL Mac
+    # #   if: ${{ matrix.os == 'macos-latest' }}
+    # #   run: |
+    # #     for i in $(which -a openssl) ; do  echo $i; $i version ; echo ""; done
+    # #     set -v
+    # #     find /usr/lib -name libcrypto*.dylib -ls || true
+    # #     find /usr/local -name libcrypto*.dylib -ls || true
+    # #     find /opt/local/lib -name libcrypto*.dylib -ls || true
+    # # - name: Find OpenSSL Win
+    # #   if: ${{ matrix.os == 'windows-latest' }}
+    # #   run: |
+    # #     where /T openssl
+    # #     echo "==="
+    # #     where /T libcrypto.dll
+    # #     echo "==="
+    # #     dir "C:\Program Files\OpenSSL\bin\"
+    # #     C:
+    # #     cd \
+    # #     dir /s libcrypto*.dll
+    # #   shell: cmd
+    # - name: env sort
+    #   if: always()
+    #   run: |
+    #     env | sort