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 5f91cbe54 Replace copy-and-paste job definitions in action with 2x2
matrix
5f91cbe54 is described below
commit 5f91cbe54cfb4d7a481436bb1e03945789f5f8df
Author: rainerjung <[email protected]>
AuthorDate: Mon Jun 29 19:17:34 2026 +0200
Replace copy-and-paste job definitions in action with 2x2 matrix
---
.github/workflows/makefile-isapi-win.yml | 131 ++-----------------------------
1 file changed, 8 insertions(+), 123 deletions(-)
diff --git a/.github/workflows/makefile-isapi-win.yml
b/.github/workflows/makefile-isapi-win.yml
index f5ab9e5d9..ed58da8a6 100644
--- a/.github/workflows/makefile-isapi-win.yml
+++ b/.github/workflows/makefile-isapi-win.yml
@@ -8,10 +8,12 @@ permissions:
contents: read
jobs:
- build-pcre2:
+ build:
strategy:
fail-fast: false
matrix:
+ pcre: [pcre2, pcre]
+ winver: [WIN10, WIN7]
include:
- name: Default
triplet: x64-windows
@@ -35,132 +37,15 @@ jobs:
call "C:\Program Files\Microsoft Visual
Studio\18\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=${{ matrix.arch }}
cd native
cd iis
- echo "Building for ${{ matrix.build-arch }}"
- nmake -f Makefile.vc CPU=${{ matrix.build-arch }}
STATIC_CRT=Hybrid PCRE=pcre2
+ echo "Building for CPU=${{ matrix.build-arch }} WINVER=${{
matrix.winver }} PCRE=${{ matrix.pcre }}"
+ nmake -f Makefile.vc CPU=${{ matrix.build-arch }} WINVER=${{
matrix.winver }} STATIC_CRT=Hybrid PCRE=${{ matrix.pcre }}
- 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\iis\WIN10_X64_DLL_RELEASE\isapi_redirect.dll
+ dumpbin.exe /DEPENDENTS native\iis\${{ matrix.winver
}}_X64_DLL_RELEASE\isapi_redirect.dll
- uses: actions/upload-artifact@v7
with:
- name: win10-pcre2-isapi_redirect
- path: native\iis\WIN10_X64_DLL_RELEASE\isapi_redirect.dll
- build-pcre:
- strategy:
- fail-fast: false
- matrix:
- include:
- - name: Default
- triplet: x64-windows
- arch: x64
- build-arch: X64
- build-type: Debug
- generator: "Ninja"
- runs-on: windows-latest
- steps:
- - uses: actions/checkout@v7
- - name: Download and install strawberryperl
- shell: pwsh
- run: |
- echo on
- curl -L -o perl.msi
https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/download/SP_54021_64bit_UCRT/strawberry-perl-5.40.2.1-64bit.msi
- msiexec.exe /i perl.msi
- - name: Build using Nmake
- shell: cmd
- run: |
- echo on
- call "C:\Program Files\Microsoft Visual
Studio\18\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=${{ matrix.arch }}
- cd native
- cd iis
- echo "Building for ${{ matrix.build-arch }}"
- nmake -f Makefile.vc CPU=${{ matrix.build-arch }}
STATIC_CRT=Hybrid PCRE=pcre
- - 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\iis\WIN10_X64_DLL_RELEASE\isapi_redirect.dll
- - uses: actions/upload-artifact@v7
- with:
- name: win10-pcre-isapi_redirect
- path: native\iis\WIN10_X64_DLL_RELEASE\isapi_redirect.dll
- build-win7-pcre2:
- strategy:
- fail-fast: false
- matrix:
- include:
- - name: Default
- triplet: x64-windows
- arch: x64
- build-arch: X64
- build-type: Debug
- generator: "Ninja"
- runs-on: windows-latest
- steps:
- - uses: actions/checkout@v7
- - name: Download and install strawberryperl
- shell: pwsh
- run: |
- echo on
- curl -L -o perl.msi
https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/download/SP_54021_64bit_UCRT/strawberry-perl-5.40.2.1-64bit.msi
- msiexec.exe /i perl.msi
- - name: Build using Nmake
- shell: cmd
- run: |
- echo on
- call "C:\Program Files\Microsoft Visual
Studio\18\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=${{ matrix.arch }}
- cd native
- cd iis
- echo "Building for ${{ matrix.build-arch }}"
- nmake -f Makefile.vc CPU=${{ matrix.build-arch }} WINVER=WIN7
STATIC_CRT=Hybrid PCRE=pcre2
- - 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\iis\WIN7_X64_DLL_RELEASE\isapi_redirect.dll
- - uses: actions/upload-artifact@v7
- with:
- name: win7-pcre2-isapi_redirect
- path: native\iis\WIN7_X64_DLL_RELEASE\isapi_redirect.dll
- build-win7-pcre:
- strategy:
- fail-fast: false
- matrix:
- include:
- - name: Default
- triplet: x64-windows
- arch: x64
- build-arch: X64
- build-type: Debug
- generator: "Ninja"
- runs-on: windows-latest
- steps:
- - uses: actions/checkout@v7
- - name: Download and install strawberryperl
- shell: pwsh
- run: |
- echo on
- curl -L -o perl.msi
https://github.com/StrawberryPerl/Perl-Dist-Strawberry/releases/download/SP_54021_64bit_UCRT/strawberry-perl-5.40.2.1-64bit.msi
- msiexec.exe /i perl.msi
- - name: Build using Nmake
- shell: cmd
- run: |
- echo on
- call "C:\Program Files\Microsoft Visual
Studio\18\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=${{ matrix.arch }}
- cd native
- cd iis
- echo "Building for ${{ matrix.build-arch }}"
- nmake -f Makefile.vc CPU=${{ matrix.build-arch }} WINVER=WIN7
STATIC_CRT=Hybrid PCRE=pcre
- - 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\iis\WIN7_X64_DLL_RELEASE\isapi_redirect.dll
- - uses: actions/upload-artifact@v7
- with:
- name: win7-pcre-isapi_redirect
- path: native\iis\WIN7_X64_DLL_RELEASE\isapi_redirect.dll
+ name: ${{ matrix.winver }}-${{ matrix.pcre }}-isapi_redirect
+ path: native\iis\${{ matrix.winver
}}_X64_DLL_RELEASE\isapi_redirect.dll
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
