From e3a4e8649d1f6d7623c1d8adcdb5de133bb8a9ee Mon Sep 17 00:00:00 2001 From: Ivan Zhakov Date: Sat, 14 Sep 2024 16:36:32 +0000 Subject: [PATCH] .github/workflows/windows.yml: Add minimal and full build configuration. git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/branches/1.7.x@1920640 13f79535-47bb-0310-9956-ffa450edef68 --- .github/workflows/windows.yml | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 5bcd9c49..67c3fb38 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -20,6 +20,7 @@ jobs: generator: Ninja build-shared: ON dso-build: ON + packages: expat - name: Shared (no DSO) os: windows-latest triplet: x64-windows @@ -28,6 +29,33 @@ jobs: generator: Ninja build-shared: ON dso-build: OFF + packages: expat + - name: Minimal + os: windows-latest + triplet: x64-windows + arch: x64 + build-type: Debug + generator: Ninja + 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 + os: windows-latest + triplet: x64-windows + arch: x64 + build-type: Debug + generator: Ninja + build-shared: ON + dso-build: OFF + packages: expat sqlite3 openssl + config: >- + -DAPU_HAVE_ODBC=ON + -DAPU_HAVE_SQLITE3=ON + -DAPU_HAVE_CRYPTO=ON - name: Static os: windows-latest triplet: x64-windows @@ -36,6 +64,7 @@ jobs: generator: Ninja build-shared: OFF dso-build: OFF + packages: expat fail-fast: false name: "MSVC ${{ matrix.arch }} [${{ matrix.build-type }}] build-shared=${{ matrix.build-shared }} on ${{ matrix.os }}" @@ -56,7 +85,7 @@ jobs: core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || ''); - name: Install dependencies - run: vcpkg install --triplet ${{ matrix.triplet }} expat + run: vcpkg install --triplet ${{ matrix.triplet }} ${{ matrix.packages }} - uses: actions/checkout@v4 with: @@ -104,7 +133,8 @@ jobs: -DAPR_BUILD_TESTAPR=ON ^ -DAPR_HAS_LDAP=OFF ^ -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake ^ - -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/install + -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/install ^ + ${{ matrix.config }} - name: Build # Build your program with the given configuration