From 59fd253ddddcab21d677c9b994ffdd86b27a2ddb Mon Sep 17 00:00:00 2001
From: Ivan Zhakov <ivan@apache.org>
Date: Sun, 15 Sep 2024 14:50:32 +0000
Subject: [PATCH] .github/workflows/windows.yml: Add job to build with expat.

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1920684 13f79535-47bb-0310-9956-ffa450edef68
---
 .github/workflows/windows.yml | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 1f6bb4f629..9023c41dd8 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -20,7 +20,6 @@ jobs:
             generator: Ninja
             build-shared: ON
             dso-build: ON
-            packages: expat
           - name: Default x86
             os: windows-latest
             triplet: x86-windows
@@ -29,7 +28,19 @@ jobs:
             generator: Ninja
             build-shared: ON
             dso-build: ON
+          - name: Use Expat
+            os: windows-latest
+            triplet: x64-windows
+            arch: x64
+            build-type: Debug
+            generator: Ninja
+            build-shared: ON
+            dso-build: ON
             packages: expat
+            config: >-
+              -DAPU_USE_XMLITE=OFF
+              -DAPU_USE_EXPAT=ON
+              -DAPU_USE_LIBXML2=OFF
           - name: Use Libxml2
             os: windows-latest
             triplet: x64-windows
@@ -64,7 +75,6 @@ jobs:
             generator: Ninja
             build-shared: ON
             dso-build: OFF
-            packages: expat
           - name: Minimal
             os: windows-latest
             triplet: x64-windows
@@ -73,7 +83,6 @@ jobs:
             generator: Ninja
             build-shared: ON
             dso-build: OFF
-            packages: expat
             config: >-
               -DAPU_HAVE_ODBC=OFF
               -DAPU_HAVE_SQLITE3=OFF
@@ -86,7 +95,7 @@ jobs:
             generator: Ninja
             build-shared: ON
             dso-build: OFF
-            packages: expat sqlite3 openssl libiconv
+            packages: sqlite3 openssl libiconv
             config: >-
               -DAPU_HAVE_ODBC=ON
               -DAPU_HAVE_SQLITE3=ON
@@ -100,7 +109,6 @@ jobs:
             generator: Ninja
             build-shared: OFF
             dso-build: OFF
-            packages: expat
       fail-fast: false
 
     name: ${{ matrix.name }}