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 7dedc575 Use bash on Windows [skip ci]
7dedc575 is described below
commit 7dedc575fcdd11198374bbec300b8c5d36d7bd1b
Author: Sebb <s...@apache.org>
AuthorDate: Wed Nov 1 00:31:18 2023 +0000
Use bash on Windows [skip ci]
---
.github/workflows/maven_adhoc.yml | 62 +++++++++++++++++++--------------------
1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/.github/workflows/maven_adhoc.yml
b/.github/workflows/maven_adhoc.yml
index d09a11f9..65f4f11b 100644
--- a/.github/workflows/maven_adhoc.yml
+++ b/.github/workflows/maven_adhoc.yml
@@ -41,44 +41,44 @@ jobs:
steps:
- name: Search
run: |
- Get-Childitem –Path C:\ -File -Include libcrypto* -Recurse
-ErrorAction SilentlyContinue
- # - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #
v4.1.1
- # with:
- # persist-credentials: false
- # - name: Set up JDK ${{ matrix.java }}
- # uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 #
v3.13.0
- # with:
- # distribution: 'temurin'
- # java-version: ${{ matrix.java }}
- # - name: OpenSSL version
- # run: openssl version -a
- # - name: OpenSSL engine (macos)
- # # need to override the libarary on macOS
- # if: ${{ matrix.os == 'macos-11' }}
- # run: |
- # echo $(openssl version -e | sed -n -e 's/engines-.*//' -e 's/:
"/=/p') >> "$GITHUB_ENV"
- # - name: OpenSSL engine (windows)
- # # need to override the libarary on windows
- # if: ${{ matrix.os == 'windows-latest' }}
- # # e.g. ENGINESDIR: "C:\Program Files\OpenSSL\lib\engines-1_1"
- # run: |
- # openssl version -e
- # chcp 65001 #set code page to utf-8
- # echo ((openssl version -e) -replace ': "','=' -replace
'\\engines-.*','') >> $env:GITHUB_ENV
- # echo ((openssl version -e) -replace ': "','=' -replace
'\\engines-.*','')
+ dir c:\
+ # Get-Childitem –Path C:\ -File -Include libcrypto* -Recurse -ErrorAction
SilentlyContinue
+ - name: Checkout
+ uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+ with:
+ persist-credentials: false
+ - name: Set up JDK ${{ matrix.java }}
+ uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 #
v3.13.0
+ with:
+ distribution: 'temurin'
+ java-version: ${{ matrix.java }}
+ - name: OpenSSL version
+ run: openssl version -a
+ - name: OpenSSL engine (macos)
+ # need to override the libarary on macOS
+ if: ${{ matrix.os == 'macos-11' }}
+ run: |
+ echo $(openssl version -e | sed -n -e 's/engines-.*//' -e 's/: "/=/p')
>> "$GITHUB_ENV"
+ - name: OpenSSL engine (windows)
+ # need to override the libarary on windows
+ if: ${{ matrix.os == 'windows-latest' }}
+ # e.g. ENGINESDIR: "C:\Program Files\OpenSSL\lib\engines-1_1"
+ run: |
+ chcp 65001 #set code page to utf-8
+ echo ((openssl version -e) -replace ': "','=' -replace
'\\engines-.*','') >> $env:GITHUB_ENV
# - name: Build with Maven (not Windows)
# if: ${{ matrix.os != 'windows-latest' }}
# run: |
# mvn --show-version --batch-mode --no-transfer-progress
-DtrimStackTrace=false -D"jni.library.path=$ENGINESDIR"
-D"jna.library.path=$ENGINESDIR"
- # - name: Build with Maven (Windows)
- # if: ${{ matrix.os == 'windows-latest' }}
+ - name: Build with Maven
+ shell: bash
# OPENSSL_HOME is needed for Windows build; not used by other builds so
can set unconditionally
# It's not clear how one is supposed to find the correct setting;
# The value below was found by searching for openssl files under C
(warning: slow)
# Other possible values are:
# "C:\\Miniconda\\pkgs\\openssl-1.1.1n-h2bbff1b_0\\Library"
# "C:\\ProgramData\\chocolatey\\lib\\mingw\\tools\\install\\mingw64\\opt"
- # env:
- # OPENSSL_HOME: "C:\\Miniconda\\Library"
- # run: |
- # mvn test --show-version --batch-mode --no-transfer-progress
-DtrimStackTrace=false -D"jni.library.path=$env:OPENSSL_HOME"
-D"jna.library.path=$env:OPENSSL_HOME"
+ env:
+ OPENSSL_HOME: "C:\\Miniconda\\Library"
+ run: |
+ mvn test --show-version --batch-mode --no-transfer-progress
-DtrimStackTrace=false -D"jni.library.path=$ENGINESDIR"
-D"jna.library.path=$ENGINESDIR"
