Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions .github/workflows/pr-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,16 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-15-intel]
os: [ubuntu-latest, windows-latest, macos-15-intel, macos-15]
java-version: [21, 25]
include:
- os: windows-latest
vcvars: C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat
openssl_home: C:\Program Files\OpenSSL-Win64
- os: macos-15
openssl_path: /opt/homebrew/opt/openssl@3
- os: macos-15-intel
openssl_path: /usr/local/opt/openssl@3
steps:
- uses: actions/checkout@v4
- name: Set up JDK ${{ matrix.java-version }}
Expand All @@ -31,27 +35,26 @@ jobs:
restore-keys: ${{ runner.os }}-m2
- name: Maven Version Info
run: mvn -version
- if: matrix.os != 'macos-15-intel'
- if: matrix.os != 'macos-15-intel' && matrix.os != 'macos-15'
name: OpenSSL Library Version Info
run: openssl version -v
- if: matrix.os == 'macos-15-intel'
- if: matrix.os == 'macos-15-intel' || matrix.os == 'macos-15'
name: OpenSSL Library Version Info on MacOS
run: |
#brew --prefix openssl@3
export PATH="/usr/local/opt/openssl@3/bin:$PATH"
export PATH="${{ matrix.openssl_path }}/bin:$PATH"
openssl version
- if: matrix.os == 'windows-latest'
name: Install OpenSSL 3 on Windows
shell: powershell
run: |
echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append
vcpkg install openssl:x64-windows-static-md
- if: matrix.os == 'macos-15-intel'
- if: matrix.os == 'macos-15-intel' || matrix.os == 'macos-15'
name: Build with Maven (macOS)
run: |
export PATH="/usr/local/opt/openssl@3/bin:$PATH"
export PATH="${{ matrix.openssl_path }}/bin:$PATH"
openssl version
mvn -B package --file pom.xml -Dorg.wildfly.openssl.path="/usr/local/opt/openssl@3/lib"
mvn -B package --file pom.xml -Dorg.wildfly.openssl.path="${{ matrix.openssl_path }}/lib"
- if: matrix.os == 'ubuntu-latest'
name: Build with Maven (Ubuntu)
run: |
Expand Down
19 changes: 19 additions & 0 deletions combined/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
<activation>
<os>
<family>mac</family>
<arch>x86_64</arch>
</os>
</activation>
<dependencies>
Expand All @@ -74,6 +75,24 @@
</dependency>
</dependencies>
</profile>
<profile>
<id>mac-aarch64</id>
<activation>
<os>
<family>mac</family>
<arch>aarch64</arch>
</os>
</activation>

<dependencies>
<dependency>
<groupId>org.wildfly.openssl</groupId>
<artifactId>wildfly-openssl-macosx-aarch64</artifactId>
<version>${version.org.wildfly.openssl.wildfly-openssl-macosx-aarch64}</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
<profile>
<id>linux-aarch64</id>
<activation>
Expand Down
19 changes: 19 additions & 0 deletions java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@
<activation>
<os>
<family>mac</family>
<arch>x86_64</arch>
</os>
</activation>

Expand All @@ -180,6 +181,24 @@
</dependency>
</dependencies>
</profile>
<profile>
<id>mac-aarch64</id>
<activation>
<os>
<family>mac</family>
<arch>aarch64</arch>
</os>
</activation>

<dependencies>
<dependency>
<groupId>org.wildfly.openssl</groupId>
<artifactId>wildfly-openssl-macosx-aarch64</artifactId>
<version>${version.org.wildfly.openssl.wildfly-openssl-macosx-aarch64}</version>
<scope>test</scope>
</dependency>
</dependencies>
</profile>
<profile>
<id>linux-aarch64</id>
<activation>
Expand Down
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
<version.org.wildfly.openssl.wildfly-openssl-linux-x86_64>${version.org.wildfly.openssl.natives}</version.org.wildfly.openssl.wildfly-openssl-linux-x86_64>
<version.org.wildfly.openssl.wildfly-openssl-linux-s390x>${version.org.wildfly.openssl.natives}</version.org.wildfly.openssl.wildfly-openssl-linux-s390x>
<version.org.wildfly.openssl.wildfly-openssl-macosx-x86_64>${version.org.wildfly.openssl.natives}</version.org.wildfly.openssl.wildfly-openssl-macosx-x86_64>
<version.org.wildfly.openssl.wildfly-openssl-macosx-aarch64>${version.org.wildfly.openssl.natives}</version.org.wildfly.openssl.wildfly-openssl-macosx-aarch64>
<version.org.wildfly.openssl.wildfly-openssl-windows-x86_64>${version.org.wildfly.openssl.natives}</version.org.wildfly.openssl.wildfly-openssl-windows-x86_64>

<openssl.path />
Expand Down