diff options
| author | Robert Adam <dev@robert-adam.de> | 2021-03-04 13:52:08 +0300 |
|---|---|---|
| committer | Robert Adam <dev@robert-adam.de> | 2021-03-06 20:57:22 +0300 |
| commit | d1f28fdabda9c5fa2a4219d3307a92fd95a2c3c9 (patch) | |
| tree | 191894ada76d672ffd86fb8367f49cc377a78141 | |
| parent | 55206eff33fd3af2b158b45dac840ba452e60dab (diff) | |
CI: Use unity builds
On Linux (using shared library dependencies) this reduced the average
compilation time to about 50% of the originally needed time.
| -rwxr-xr-x | .ci/azure-pipelines/build_linux.bash | 2 | ||||
| -rwxr-xr-x | .ci/azure-pipelines/build_macos.bash | 2 | ||||
| -rw-r--r-- | .ci/azure-pipelines/build_windows.bat | 2 | ||||
| -rw-r--r-- | .github/workflows/build.yml | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/.ci/azure-pipelines/build_linux.bash b/.ci/azure-pipelines/build_linux.bash index 7027cd583..08e5d8a02 100755 --- a/.ci/azure-pipelines/build_linux.bash +++ b/.ci/azure-pipelines/build_linux.bash @@ -30,7 +30,7 @@ RELEASE_ID=$(python "scripts/mumble-version.py") cd $BUILD_BINARIESDIRECTORY -cmake -G Ninja -DCMAKE_INSTALL_PREFIX=appdir/usr \ +cmake -G Ninja -DCMAKE_INSTALL_PREFIX=appdir/usr -DCMAKE_UNITY_BUILD=ON \ -DCMAKE_BUILD_TYPE=Release -DRELEASE_ID=$RELEASE_ID -DBUILD_NUMBER=$BUILD_NUMBER \ -Dtests=ON -Dsymbols=ON -Dgrpc=ON \ -Ddisplay-install-paths=ON $BUILD_SOURCESDIRECTORY diff --git a/.ci/azure-pipelines/build_macos.bash b/.ci/azure-pipelines/build_macos.bash index ca7e5f9e1..31e3d7fee 100755 --- a/.ci/azure-pipelines/build_macos.bash +++ b/.ci/azure-pipelines/build_macos.bash @@ -42,7 +42,7 @@ RELEASE_ID=$(python "scripts/mumble-version.py") cd $BUILD_BINARIESDIRECTORY cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE=$MUMBLE_ENVIRONMENT_TOOLCHAIN -DIce_HOME="$MUMBLE_ENVIRONMENT_PATH/installed/x64-osx" \ - -DCMAKE_BUILD_TYPE=Release -DRELEASE_ID=$RELEASE_ID -DBUILD_NUMBER=$BUILD_NUMBER \ + -DCMAKE_BUILD_TYPE=Release -DCMAKE_UNITY_BUILD=ON -DRELEASE_ID=$RELEASE_ID -DBUILD_NUMBER=$BUILD_NUMBER \ -Dtests=ON -Dstatic=ON -Dsymbols=ON -Dgrpc=ON \ -Ddisplay-install-paths=ON $BUILD_SOURCESDIRECTORY diff --git a/.ci/azure-pipelines/build_windows.bat b/.ci/azure-pipelines/build_windows.bat index 533228c83..4b036c89e 100644 --- a/.ci/azure-pipelines/build_windows.bat +++ b/.ci/azure-pipelines/build_windows.bat @@ -68,7 +68,7 @@ del C:\Strawberry\c\bin\c++.exe cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="%MUMBLE_ENVIRONMENT_TOOLCHAIN%" -DVCPKG_TARGET_TRIPLET=%MUMBLE_ENVIRONMENT_TRIPLET% ^ -DIce_HOME="%MUMBLE_ENVIRONMENT_PATH%\installed\%MUMBLE_ENVIRONMENT_TRIPLET%" ^ - -DCMAKE_BUILD_TYPE=Release -DRELEASE_ID=%RELEASE_ID% -DBUILD_NUMBER=%BUILD_NUMBER% ^ + -DCMAKE_BUILD_TYPE=Release -DCMAKE_UNITY_BUILD=ON -DRELEASE_ID=%RELEASE_ID% -DBUILD_NUMBER=%BUILD_NUMBER% ^ -Dpackaging=ON -Dtests=ON -Dstatic=ON -Dsymbols=ON -Dgrpc=ON -Dasio=ON -Dg15=ON ^ -Ddisplay-install-paths=ON "%BUILD_SOURCESDIRECTORY%" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b2545552c..833393ebc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,7 +56,7 @@ jobs: - name: Run CMake run: | cmake -G Ninja -S $GITHUB_WORKSPACE -B ${{runner.workspace}}/build -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CMAKE_OPTIONS \ - $ADDITIONAL_CMAKE_OPTIONS $VCPKG_CMAKE_OPTIONS + -DCMAKE_UNITY_BUILD=ON $ADDITIONAL_CMAKE_OPTIONS $VCPKG_CMAKE_OPTIONS shell: bash - name: Build |