This is an automated email from the ASF dual-hosted git repository.
rainerjung pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git
The following commit(s) were added to refs/heads/main by this push:
new 48d8ef0af Improve matrix use for mod_jk action
48d8ef0af is described below
commit 48d8ef0afce6ce6f580fdbd35b81c5d74542ca5c
Author: rainerjung <[email protected]>
AuthorDate: Mon Jun 29 19:49:40 2026 +0200
Improve matrix use for mod_jk action
---
.github/workflows/makefile-mod_jk-win.yml | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/makefile-mod_jk-win.yml
b/.github/workflows/makefile-mod_jk-win.yml
index d2478a08a..c98657e09 100644
--- a/.github/workflows/makefile-mod_jk-win.yml
+++ b/.github/workflows/makefile-mod_jk-win.yml
@@ -15,13 +15,11 @@ jobs:
strategy:
fail-fast: false
matrix:
+ winver: [WIN10]
include:
- - name: Default
- triplet: x64-windows
- arch: x64
- build-arch: X64
- build-type: Debug
- generator: "Ninja"
+ - arch: amd64
+ cpu: X64
+ httpd_arch: Win64
runs-on: windows-latest
steps:
- uses: actions/checkout@v7
@@ -35,7 +33,7 @@ jobs:
shell: pwsh
run: |
echo on
- curl -L -o httpd.zip
https://www.apachelounge.com/download/VS18/binaries/httpd-$env:APACHE_VERSION-Win64-VS18.zip
+ curl -L -o httpd.zip
https://www.apachelounge.com/download/VS18/binaries/httpd-$env:APACHE_VERSION-${{
matrix.httpd_arch }}-VS18.zip
Expand-Archive httpd.zip -DestinationPath ApacheLounge
- name: Build using Nmake
shell: cmd
@@ -47,15 +45,15 @@ jobs:
call "C:\Program Files\Microsoft Visual
Studio\18\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=${{ matrix.arch }}
cd native
cd apache-2.0
- echo "Building for ${{ matrix.build-arch }}"
- nmake -f Makefile.vc CPU=${{ matrix.build-arch }}
STATIC_CRT=Hybrid APACHE2_HOME=%APACHE2_HOME%
+ echo "Building for CPU=${{ matrix.cpu }} WINVER=${{ matrix.winver
}}"
+ nmake -f Makefile.vc CPU=${{ matrix.cpu }} WINVER=${{
matrix.winver }} STATIC_CRT=Hybrid APACHE2_HOME=%APACHE2_HOME%
- name: show dependents
shell: cmd
run: |
echo on
call "C:\Program Files\Microsoft Visual
Studio\18\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=${{ matrix.arch }}
- dumpbin.exe /DEPENDENTS
native\apache-2.0\WIN10_X64_DLL_RELEASE\mod_jk.so
+ dumpbin.exe /DEPENDENTS native\apache-2.0\${{ matrix.winver }}_${{
matrix.cpu }} _DLL_RELEASE\mod_jk.so
- uses: actions/upload-artifact@v7
with:
- name: win10-md_jk
- path: native\apache-2.0\WIN10_X64_DLL_RELEASE\mod_jk.so
+ name: ${{ matrix.winver }}-${{ matrix.cpu }}-mod_jk
+ path: native\apache-2.0\${{ matrix.winver }} _${{ matrix.cpu }}
_DLL_RELEASE\mod_jk.so
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
