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 f12fa8b1 Try a few more OS checks
f12fa8b1 is described below
commit f12fa8b1b73cb8c53043906bacf10a8ab7dccc20
Author: Sebb <s...@apache.org>
AuthorDate: Sat Nov 18 11:25:13 2023 +0000
Try a few more OS checks
---
.github/workflows/adhoctest.yml | 80 +++++------------------------------------
1 file changed, 9 insertions(+), 71 deletions(-)
diff --git a/.github/workflows/adhoctest.yml b/.github/workflows/adhoctest.yml
index f029543d..ca9fe24c 100644
--- a/.github/workflows/adhoctest.yml
+++ b/.github/workflows/adhoctest.yml
@@ -32,82 +32,20 @@ jobs:
build:
runs-on: ${{ matrix.os }}
- # env:
- # LD_LIBRARY_PATH: "/usr/local"
- # DYLD_LIBRARY_PATH: "/usr/local"
- # ZLD_LIBRARY_PATH: "/usr/local"
- # ZDYLD_LIBRARY_PATH: "/usr/local"
- # DYLD: "/usr/local"
- # DYLD_: "/usr/local"
- # commons.crypto.debug: true
strategy:
matrix:
- # os: [macos-latest]
- os: [windows-latest]
- java: [ 8 ]
- # ref: [ 'rel/commons-crypto-1.1.0', master ]
- ref: [ master ]
+ os: [windows-latest, macos-11, macos-12, macos-13, ubuntu-20.04,
ubuntu-22.04]
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 }}
- name: OpenSSL version
run: openssl version -a
- - name: Find libcrypto
+ - name: Find libcrypto on Windows
+ if: ${{ startsWith(matrix.os,'windows') }}
run: |
- dir -s 'C:\Program Files\' 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"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: |
- # 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' }}
- # # 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
+ dir -s 'C:\Program Files\' libcrypto*.dll
+ - name: Find libcrypto on !Windows
+ if: ${{ ! startsWith(matrix.os,'windows') }}
+ run: |
+ which -a openssl
+ find /usr -name libcrypto* -ls
