You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by iv...@apache.org on 2024/09/15 14:40:15 UTC
svn commit: r1920682 - /apr/apr/trunk/.github/workflows/windows.yml
Author: ivan
Date: Sun Sep 15 14:40:14 2024
New Revision: 1920682
URL: http://svn.apache.org/viewvc?rev=1920682&view=rev
Log:
.github/workflows/windows.yml: Use Ninja generator.
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=1920682&r1=1920681&r2=1920682&view=diff
==============================================================================
--- apr/apr/trunk/.github/workflows/windows.yml (original)
+++ apr/apr/trunk/.github/workflows/windows.yml Sun Sep 15 14:40:14 2024
@@ -17,8 +17,7 @@ jobs:
triplet: x64-windows
arch: x64
build-type: Debug
- generator: "Visual Studio 17 2022"
- toolset: "v143"
+ generator: Ninja
build-shared: ON
dso-build: ON
packages: expat
@@ -27,8 +26,7 @@ jobs:
triplet: x86-windows
arch: x86
build-type: Debug
- generator: "Visual Studio 17 2022"
- toolset: "v143"
+ generator: Ninja
build-shared: ON
dso-build: ON
packages: expat
@@ -37,8 +35,7 @@ jobs:
triplet: x64-windows
arch: x64
build-type: Debug
- generator: "Visual Studio 17 2022"
- toolset: "v143"
+ generator: Ninja
build-shared: ON
dso-build: ON
packages: libxml2
@@ -51,8 +48,7 @@ jobs:
triplet: x64-windows
arch: x64
build-type: Debug
- generator: "Visual Studio 17 2022"
- toolset: "v143"
+ generator: Ninja
build-shared: ON
dso-build: ON
packages: libxml2
@@ -65,8 +61,7 @@ jobs:
triplet: x64-windows
arch: x64
build-type: Debug
- generator: "Visual Studio 17 2022"
- toolset: "v143"
+ generator: Ninja
build-shared: ON
dso-build: OFF
packages: expat
@@ -75,8 +70,7 @@ jobs:
triplet: x64-windows
arch: x64
build-type: Debug
- generator: "Visual Studio 17 2022"
- toolset: "v143"
+ generator: Ninja
build-shared: ON
dso-build: OFF
packages: expat
@@ -89,8 +83,7 @@ jobs:
triplet: x64-windows
arch: x64
build-type: Debug
- generator: "Visual Studio 17 2022"
- toolset: "v143"
+ generator: Ninja
build-shared: ON
dso-build: OFF
packages: expat sqlite3 openssl libiconv
@@ -104,8 +97,7 @@ jobs:
triplet: x64-windows-static
arch: x64
build-type: Debug
- generator: "Visual Studio 17 2022"
- toolset: "v143"
+ generator: Ninja
build-shared: OFF
dso-build: OFF
packages: expat
@@ -126,22 +118,26 @@ 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
- -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 }}
+ shell: cmd
+ run: |
+ call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=${{ matrix.arch }}
+ cmake -B ${{github.workspace}}/build ^
+ -G "${{ matrix.generator }}" ^
+ -A ${{ matrix.arch }} ^
+ -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
- run: cmake --build ${{github.workspace}}/build --config ${{ matrix.build-type }}
+ shell: cmd
+ run: |
+ call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=${{ matrix.arch }}
+ cmake --build ${{github.workspace}}/build --config ${{ matrix.build-type }}
- name: Test
working-directory: ${{github.workspace}}/build