Don't explicitly enable unity builds in CI configurations since it's …

…already the default
pika-org · Jan 12, 2024 · 34a15d0 · 34a15d0
1 parent 09604f6
commit 34a15d0
Show file tree

Hide file tree

Showing 11 changed files with 1 addition and 11 deletions.
diff --git a/.github/workflows/linux_coverage.yml b/.github/workflows/linux_coverage.yml
@@ -36,7 +36,6 @@ jobs:
                 -DCMAKE_BUILD_TYPE=Debug \
                 -DCMAKE_CXX_FLAGS="--coverage" \
                 -DCMAKE_EXE_LINKER_FLAGS="--coverage" \
-                -DPIKA_WITH_UNITY_BUILD=ON \
                 -DPIKA_WITH_MALLOC=system \
                 -DPIKA_WITH_EXAMPLES=ON \
                 -DPIKA_WITH_TESTS=ON \

diff --git a/.github/workflows/linux_debug.yml b/.github/workflows/linux_debug.yml
@@ -41,7 +41,6 @@ jobs:
                 -GNinja \
                 -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
                 -DCMAKE_BUILD_TYPE=Debug \
-                -DPIKA_WITH_UNITY_BUILD=ON \
                 -DPIKA_WITH_MALLOC=system \
                 -DPIKA_WITH_EXAMPLES=ON \
                 -DPIKA_WITH_TESTS=ON \

diff --git a/.github/workflows/linux_hip.yml b/.github/workflows/linux_hip.yml
@@ -41,7 +41,6 @@ jobs:
                 -GNinja \
                 -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
                 -DCMAKE_BUILD_TYPE=Debug \
-                -DPIKA_WITH_UNITY_BUILD=ON \
                 -DPIKA_WITH_MALLOC=system \
                 -DPIKA_WITH_HIP=ON \
                 -DPIKA_WITH_EXAMPLES=ON \

diff --git a/.github/workflows/linux_leaksanitizer.yml b/.github/workflows/linux_leaksanitizer.yml
@@ -41,7 +41,6 @@ jobs:
                 -GNinja \
                 -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
                 -DCMAKE_BUILD_TYPE=Debug \
-                -DPIKA_WITH_UNITY_BUILD=ON \
                 -DPIKA_WITH_MALLOC=system \
                 -DPIKA_WITH_EXAMPLES=ON \
                 -DPIKA_WITH_TESTS=ON \

diff --git a/.github/workflows/linux_release_fetchcontent.yml b/.github/workflows/linux_release_fetchcontent.yml
@@ -44,7 +44,6 @@ jobs:
                 -DCMAKE_BUILD_TYPE=Release \
                 -DPIKA_REPOSITORY="file:////$(pwd)" \
                 -DPIKA_TAG="$GITHUB_SHA" \
-                -DPIKA_WITH_UNITY_BUILD=ON \
                 -DPIKA_WITH_MALLOC=system \
                 -DPIKA_WITH_EXAMPLES=ON \
                 -DPIKA_WITH_TESTS=OFF \

diff --git a/.github/workflows/linux_sanitizers.yml b/.github/workflows/linux_sanitizers.yml
@@ -42,7 +42,6 @@ jobs:
                 -GNinja \
                 -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
                 -DCMAKE_BUILD_TYPE=Debug \
-                -DPIKA_WITH_UNITY_BUILD=ON \
                 -DPIKA_WITH_MALLOC=system \
                 -DPIKA_WITH_EXAMPLES=ON \
                 -DPIKA_WITH_TESTS=ON \

diff --git a/.github/workflows/linux_tracy.yml b/.github/workflows/linux_tracy.yml
@@ -71,7 +71,6 @@ jobs:
                 -GNinja \
                 -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
                 -DCMAKE_BUILD_TYPE=Debug \
-                -DPIKA_WITH_UNITY_BUILD=ON \
                 -DPIKA_WITH_MALLOC=system \
                 -DPIKA_WITH_TRACY=ON \
                 -DPIKA_WITH_EXAMPLES=ON \

diff --git a/.github/workflows/linux_valgrind.yml b/.github/workflows/linux_valgrind.yml
@@ -47,7 +47,6 @@ jobs:
                 -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
                 -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
                 -DCMAKE_CXX_FLAGS="-gdwarf-4" \
-                -DPIKA_WITH_UNITY_BUILD=ON \
                 -DPIKA_WITH_MALLOC=system \
                 -DPIKA_WITH_EXAMPLES=ON \
                 -DPIKA_WITH_TESTS=ON \

diff --git a/.github/workflows/macos_debug.yml b/.github/workflows/macos_debug.yml
@@ -51,7 +51,6 @@ jobs:
                 -GNinja \
                 -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
                 -DCMAKE_BUILD_TYPE=Debug \
-                -DPIKA_WITH_UNITY_BUILD=ON \
                 -DPIKA_WITH_EXAMPLES=ON \
                 -DPIKA_WITH_TESTS=ON \
                 -DPIKA_WITH_TESTS_HEADERS=OFF \

diff --git a/.gitlab/includes/clang12_pipeline.yml b/.gitlab/includes/clang12_pipeline.yml
@@ -18,7 +18,7 @@ include:
                  ^hwloc@2.2.0"
     CMAKE_FLAGS: "-DCMAKE_BUILD_TYPE=$BUILD_TYPE -DPIKA_WITH_CXX_STANDARD=$CXXSTD \
                   -DPIKA_WITH_MALLOC=system -DPIKA_WITH_SPINLOCK_DEADLOCK_DETECTION=ON \
-                  -DPIKA_WITH_UNITY_BUILD=ON -DPIKA_WITH_COROUTINE_COUNTERS=ON \
+                  -DPIKA_WITH_COROUTINE_COUNTERS=ON \
                   -DPIKA_WITH_THREAD_IDLE_RATES=ON \
                   -DPIKA_WITH_THREAD_CREATION_AND_CLEANUP_RATES=ON \
                   -DPIKA_WITH_THREAD_CUMULATIVE_COUNTS=ON -DPIKA_WITH_THREAD_QUEUE_WAITTIME=ON \

diff --git a/.jenkins/cscs/env-clang-12.sh b/.jenkins/cscs/env-clang-12.sh
@@ -16,7 +16,6 @@ spack_spec="pika@main arch=${spack_arch} %${spack_compiler} malloc=system cxxstd
 configure_extra_options+=" -DPIKA_WITH_CXX_STANDARD=${cxx_std}"
 configure_extra_options+=" -DPIKA_WITH_MALLOC=system"
 configure_extra_options+=" -DPIKA_WITH_SPINLOCK_DEADLOCK_DETECTION=ON"
-configure_extra_options+=" -DPIKA_WITH_UNITY_BUILD=ON"
 configure_extra_options+=" -DPIKA_WITH_COROUTINE_COUNTERS=ON"
 configure_extra_options+=" -DPIKA_WITH_THREAD_IDLE_RATES=ON"
 configure_extra_options+=" -DPIKA_WITH_THREAD_CREATION_AND_CLEANUP_RATES=ON"