From 6d78ebe15486d0139254b334d1ec022482dd38bd Mon Sep 17 00:00:00 2001
From: Tom M <tom.mbrt@googlemail.com>
Date: Mon, 10 May 2021 22:00:03 +0200
Subject: [PATCH] Speed up Windows CI a bit (#883)

---
 .appveyor-vcpkg.yml  | 10 +++++-----
 .azure-pipelines.yml | 14 +++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.appveyor-vcpkg.yml b/.appveyor-vcpkg.yml
index 029ae71e..f2de1339 100644
--- a/.appveyor-vcpkg.yml
+++ b/.appveyor-vcpkg.yml
@@ -29,8 +29,8 @@ jobs:
         @ECHO ON
         echo $(generator)
         echo $(toolset)
-        choco upgrade ninja -y
-        ninja --version
+        REM choco upgrade ninja -y
+        REM ninja --version
         cmake --version
         REM manually update vcpkg
         REM cd "$(VCPKG_DIR)" || exit -1
@@ -55,14 +55,14 @@ jobs:
         @ECHO ON
         mkdir build
         cd build
-        cmake -Werror=dev -G "$(generator)" -A "$(cmake_platform)" -T "$(toolset)" -Denable-pkgconfig=0 -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_INSTALL_PREFIX=$(Build.ArtifactStagingDirectory) -DCMAKE_VERBOSE_MAKEFILE=1 -DNO_GUI=1 .. || exit -1
+        cmake -Werror=dev -G "$(generator)" -A "$(cmake_platform)" -T "$(toolset)" -Denable-pkgconfig=0  -Denable-jack=0 -Denable-pulseaudio=0 -Denable-ladspa=0 -Denable-dbus=0 -Denable-readline=0 -Denable-sdl2=0 -Denable-libinstpatch=0 -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_INSTALL_PREFIX=$(Build.ArtifactStagingDirectory) -DCMAKE_VERBOSE_MAKEFILE=1 -DNO_GUI=1 .. || exit -1
         REM build libfluidsynth and fluidsynth exec
-        cmake --build . --config $(configuration) || exit -1
+        cmake --build . --config $(configuration) --parallel 3 || exit -1
       displayName: 'Compile fluidsynth'
     - script: |
         @ECHO ON
         REM build and exec unittests, unless when cross-compiling
-        if not "%platform%"=="ARM" ( cmake --build build --config $(configuration) --target check )
+        if not "%platform%"=="ARM" ( cmake --build build --config $(configuration) --target check --parallel 3 )
       displayName: 'Execute Unittests'
     - script: |
         @ECHO ON
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 5828a825..594d1cb6 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -54,8 +54,8 @@ jobs:
         SET "PATH=d:\deps\bin;%PATH%"
         pkg-config --list-all
         mkdir build && cd build || exit -1
-        cmake -Werror=dev -A $(platform) -T $(toolset) -DCMAKE_INSTALL_PREFIX=$(Build.ArtifactStagingDirectory) -Denable-readline=0 -Denable-floats=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DCMAKE_VERBOSE_MAKEFILE=1 -DNO_GUI=1 -Dwindows-version=0x0501 .. || exit -1
-        cmake --build . --config Release || exit -1
+        cmake -Werror=dev -A $(platform) -T $(toolset) -DCMAKE_INSTALL_PREFIX=$(Build.ArtifactStagingDirectory) -Denable-readline=0 -Denable-floats=1 -Denable-jack=0 -Denable-sdl2=0 -DCMAKE_BUILD_TYPE=Release -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DCMAKE_VERBOSE_MAKEFILE=1 -DNO_GUI=1 -Dwindows-version=0x0501 .. || exit -1
+        cmake --build . --config Release --parallel 3 || exit -1
       displayName: 'Compile fluidsynth'
     - script: |
         @ECHO ON
@@ -99,7 +99,7 @@ jobs:
         CMAKE_FLAGS: -DBUILD_SHARED_LIBS=0
         CMAKE_CONFIG: Release
       minimal:
-        CMAKE_FLAGS: -Denable-ipv6=0 -Denable-network=0 -Denable-aufile=0 -Denable-dbus=0 -Denable-threads=0 -Denable-winmidi=0 -Denable-waveout=0 -Denable-dsound=0 -Denable-libsndfile=0 -Denable-floats=1
+        CMAKE_FLAGS: -Denable-ipv6=0 -Denable-network=0 -Denable-aufile=0 -Denable-threads=0 -Denable-winmidi=0 -Denable-waveout=0 -Denable-dsound=0 -Denable-libsndfile=0 -Denable-floats=1
         CMAKE_CONFIG: Release
   pool:
     vmImage: 'windows-2019'
@@ -121,8 +121,8 @@ jobs:
         @ECHO ON
         SET "PATH=d:\deps\bin;%PATH%"
         mkdir build && cd build || exit -1
-        cmake -Werror=dev -A x64 -T $(toolset) -DCMAKE_BUILD_TYPE=$(CMAKE_CONFIG) -DCMAKE_VERBOSE_MAKEFILE=1 $(CMAKE_FLAGS) -DNO_GUI=1 -Dwindows-version=0x0A00 .. || exit -1
-        cmake --build . --config $(CMAKE_CONFIG) || exit -1
+        cmake -Werror=dev -A x64 -T $(toolset) -DCMAKE_BUILD_TYPE=$(CMAKE_CONFIG) -DCMAKE_VERBOSE_MAKEFILE=1 $(CMAKE_FLAGS) -DNO_GUI=1 -Dwindows-version=0x0A00 -Denable-jack=0 -Denable-pulseaudio=0 -Denable-ladspa=0 -Denable-dbus=0 -Denable-readline=0 -Denable-sdl2=0 -Denable-libinstpatch=0 .. || exit -1
+        cmake --build . --config $(CMAKE_CONFIG) --parallel 3 || exit -1
       displayName: 'Compile fluidsynth'
     - script: |
         @ECHO ON
@@ -186,8 +186,8 @@ jobs:
         set PATH=%PATH:C:\Program Files\Git\usr\bin;=%
         pkg-config --list-all
         mkdir build && cd build || exit -1
-        cmake -Werror=dev -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=$(Build.ArtifactStagingDirectory) $(CMAKE_FLAGS) -Denable-readline=0 -Denable-floats=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=1 -DNO_GUI=1 .. || exit -1
-        mingw32-make.exe -j4 all || exit -1
+        cmake -Werror=dev -G "MinGW Makefiles" -DCMAKE_INSTALL_PREFIX=$(Build.ArtifactStagingDirectory) $(CMAKE_FLAGS) -Denable-readline=0 -Denable-floats=1 -Denable-jack=0 -Denable-pulseaudio=0 -Denable-ladspa=0 -Denable-dbus=0 -Denable-sdl2=0 -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=1 -DNO_GUI=1 .. || exit -1
+        mingw32-make.exe -j3 all || exit -1
       displayName: 'Compile fluidsynth'
     - script: |
         @ECHO ON