svn commit: r1920677 - /apr/apr/trunk/.github/workflows/windows.yml

Author: ivan
Date: Sun Sep 15 14:04:07 2024
New Revision: 1920677

URL: http://svn.apache.org/viewvc?rev=1920677&view=rev
Log:
.github/workflows/windows.yml: Explicitly list interested configurations.

Modified:
    apr/apr/trunk/.github/workflows/windows.yml

Modified: apr/apr/trunk/.github/workflows/windows.yml
URL: http://svn.apache.org/viewvc/apr/apr/trunk/.github/workflows/windows.yml?rev=1920677&r1=1920676&r2=1920677&view=diff
==============================================================================
--- apr/apr/trunk/.github/workflows/windows.yml (original)
+++ apr/apr/trunk/.github/workflows/windows.yml Sun Sep 15 14:04:07 2024
@@ -11,15 +11,99 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [windows-latest]
-        build-type: [Debug, Release]
-        generator: [ "Visual Studio 17 2022" ]
-        arch: [ "Win32", "x64" ]
-        toolset: [ "v143", "v142" ]
-        build-shared: [ "ON", "OFF" ]
+        include:
+          - name: Default
+            os: windows-latest
+            triplet: x64-windows
+            arch: x64
+            build-type: Debug
+            generator: "Visual Studio 17 2022"
+            build-shared: ON
+            dso-build: ON
+            packages: expat
+          - name: Default x86
+            os: windows-latest
+            triplet: x86-windows
+            arch: x86
+            build-type: Debug
+            generator: "Visual Studio 17 2022"
+            build-shared: ON
+            dso-build: ON
+            packages: expat
+          - name: Use Libxml2
+            os: windows-latest
+            triplet: x64-windows
+            arch: x64
+            build-type: Debug
+            generator: "Visual Studio 17 2022"
+            build-shared: ON
+            dso-build: ON
+            packages: libxml2
+            config: >-
+              -DAPU_USE_XMLITE=OFF
+              -DAPU_USE_EXPAT=OFF
+              -DAPU_USE_LIBXML2=ON
+          - name: Use XmlLite
+            os: windows-latest
+            triplet: x64-windows
+            arch: x64
+            build-type: Debug
+            generator: "Visual Studio 17 2022"
+            build-shared: ON
+            dso-build: ON
+            packages: libxml2
+            config: >-
+              -DAPU_USE_XMLITE=ON
+              -DAPU_USE_EXPAT=OFF
+              -DAPU_USE_LIBXML2=OFF
+          - name: Shared (no DSO)
+            os: windows-latest
+            triplet: x64-windows
+            arch: x64
+            build-type: Debug
+            generator: "Visual Studio 17 2022"
+            build-shared: ON
+            dso-build: OFF
+            packages: expat
+          - name: Minimal
+            os: windows-latest
+            triplet: x64-windows
+            arch: x64
+            build-type: Debug
+            generator: "Visual Studio 17 2022"
+            build-shared: ON
+            dso-build: OFF
+            packages: expat
+            config: >-
+              -DAPU_HAVE_ODBC=OFF
+              -DAPU_HAVE_SQLITE3=OFF
+              -DAPU_HAVE_CRYPTO=OFF
+          - name: ODBC + Sqlite3 + Crypto + Iconv
+            os: windows-latest
+            triplet: x64-windows
+            arch: x64
+            build-type: Debug
+            generator: "Visual Studio 17 2022"
+            build-shared: ON
+            dso-build: OFF
+            packages: expat sqlite3 openssl libiconv
+            config: >-
+              -DAPU_HAVE_ODBC=ON
+              -DAPU_HAVE_SQLITE3=ON
+              -DAPU_HAVE_CRYPTO=ON
+              -DAPU_HAVE_ICONV=ON
+          - name: Static
+            os: windows-latest
+            triplet: x64-windows-static
+            arch: x64
+            build-type: Debug
+            generator: "Visual Studio 17 2022"
+            build-shared: OFF
+            dso-build: OFF
+            packages: expat
       fail-fast: false
-    
-    name: "MSVC ${{ matrix.toolset }} ${{ matrix.arch }} [${{ matrix.build-type }}] build-shared=${{ matrix.build-shared }} on ${{ matrix.os }}"
+
+    name: ${{ matrix.name }}
     # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
     # You can convert this to a matrix build if you need cross-platform coverage.
     # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
@@ -31,7 +115,18 @@ jobs:
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} -DAPR_BUILD_TESTAPR=ON -DBUILD_SHARED_LIBS=${{ matrix.build-shared }} -G "${{ matrix.generator }}" -A ${{ matrix.arch }} -T ${{ matrix.toolset }}
+      run: >-
+          cmake -B ${{github.workspace}}/build
+          -G "${{ matrix.generator }}"
+          -A ${{ matrix.arch }}
+          -T ${{ matrix.toolset }}
+          -DCMAKE_BUILD_TYPE=${{ matrix.build-type }}
+          -DBUILD_SHARED_LIBS=${{ matrix.build-shared }}
+          -DAPR_MODULAR_DSO=${{ matrix.dso-build }}
+          -DAPR_BUILD_TESTAPR=ON
+          -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake
+          -DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }}
+          ${{ matrix.config }}
 
     - name: Build
       # Build your program with the given configuration