You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2026/06/29 17:42:32 UTC

(tomcat-connectors) branch main updated: Drop unused matrix includes from action definition; arch x64 => amd64

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 eadb13578 Drop unused matrix includes from action definition; arch x64 => amd64
eadb13578 is described below

commit eadb13578c3be9b48378734097fb6f80a58c98ee
Author: rainerjung <ra...@kippdata.de>
AuthorDate: Mon Jun 29 19:42:28 2026 +0200

    Drop unused matrix includes from action definition; arch x64 => amd64
---
 .github/workflows/makefile-isapi-win.yml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/makefile-isapi-win.yml b/.github/workflows/makefile-isapi-win.yml
index ed58da8a6..e9eaff2ad 100644
--- a/.github/workflows/makefile-isapi-win.yml
+++ b/.github/workflows/makefile-isapi-win.yml
@@ -15,12 +15,8 @@ jobs:
         pcre: [pcre2, pcre]
         winver: [WIN10, WIN7]
         include:
-          - name: Default
-            triplet: x64-windows
-            arch: x64
-            build-arch: X64
-            build-type: Debug
-            generator: "Ninja"
+          - arch: amd64
+            cpu: X64
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v7
@@ -37,15 +33,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 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 }}
+            echo "Building for CPU=${{ matrix.cpu }} WINVER=${{ matrix.winver }} PCRE=${{ matrix.pcre }}"
+            nmake -f Makefile.vc CPU=${{ matrix.cpu }} 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\${{ matrix.winver }}_X64_DLL_RELEASE\isapi_redirect.dll
+            dumpbin.exe /DEPENDENTS native\iis\${{ matrix.winver }}_${{ matrix.cpu }}_DLL_RELEASE\isapi_redirect.dll
     - uses: actions/upload-artifact@v7
       with:
         name: ${{ matrix.winver }}-${{ matrix.pcre }}-isapi_redirect
-        path: native\iis\${{ matrix.winver }}_X64_DLL_RELEASE\isapi_redirect.dll
+        path: native\iis\${{ matrix.winver }}_${{ matrix.cpu }}_DLL_RELEASE\isapi_redirect.dll


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org