Skip to content

Commit 59fd253

Browse files
author
Ivan Zhakov
committed
.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
1 parent 4808455 commit 59fd253

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

.github/workflows/windows.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ jobs:
2020
generator: Ninja
2121
build-shared: ON
2222
dso-build: ON
23-
packages: expat
2423
- name: Default x86
2524
os: windows-latest
2625
triplet: x86-windows
@@ -29,7 +28,19 @@ jobs:
2928
generator: Ninja
3029
build-shared: ON
3130
dso-build: ON
31+
- name: Use Expat
32+
os: windows-latest
33+
triplet: x64-windows
34+
arch: x64
35+
build-type: Debug
36+
generator: Ninja
37+
build-shared: ON
38+
dso-build: ON
3239
packages: expat
40+
config: >-
41+
-DAPU_USE_XMLITE=OFF
42+
-DAPU_USE_EXPAT=ON
43+
-DAPU_USE_LIBXML2=OFF
3344
- name: Use Libxml2
3445
os: windows-latest
3546
triplet: x64-windows
@@ -64,7 +75,6 @@ jobs:
6475
generator: Ninja
6576
build-shared: ON
6677
dso-build: OFF
67-
packages: expat
6878
- name: Minimal
6979
os: windows-latest
7080
triplet: x64-windows
@@ -73,7 +83,6 @@ jobs:
7383
generator: Ninja
7484
build-shared: ON
7585
dso-build: OFF
76-
packages: expat
7786
config: >-
7887
-DAPU_HAVE_ODBC=OFF
7988
-DAPU_HAVE_SQLITE3=OFF
@@ -86,7 +95,7 @@ jobs:
8695
generator: Ninja
8796
build-shared: ON
8897
dso-build: OFF
89-
packages: expat sqlite3 openssl libiconv
98+
packages: sqlite3 openssl libiconv
9099
config: >-
91100
-DAPU_HAVE_ODBC=ON
92101
-DAPU_HAVE_SQLITE3=ON
@@ -100,7 +109,6 @@ jobs:
100109
generator: Ninja
101110
build-shared: OFF
102111
dso-build: OFF
103-
packages: expat
104112
fail-fast: false
105113

106114
name: ${{ matrix.name }}

0 commit comments

Comments
 (0)