chore: Disable unity build in CI for AppleClang and GCC11 builds

Tradias · Sep 9, 2024 · 553ce0a · 553ce0a
1 parent 5d4e332
commit 553ce0a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -40,7 +40,7 @@ jobs:
             os: macos-13,
             triplet: 'x64-osx-release',
             build-type: 'Debug',
-            cmake-extra-args: '-DCMAKE_BUILD_TYPE=Debug -DVCPKG_TARGET_TRIPLET=x64-osx-release -DASIO_GRPC_HAS_STD_PMR=off',
+            cmake-extra-args: '-DCMAKE_BUILD_TYPE=Debug -DVCPKG_TARGET_TRIPLET=x64-osx-release -DASIO_GRPC_HAS_STD_PMR=off -DCMAKE_UNITY_BUILD=off',
             parallel: 4,
           }
 
@@ -135,7 +135,7 @@ jobs:
       run: ${{ env.VCPKG_ROOT }}/vcpkg install --recurse --clean-after-build --triplet ${{ env.TRIPLET }} --host-triplet ${{ env.TRIPLET }} --x-install-root=${{ runner.workspace }}/vcpkg_installed --overlay-ports=${{ github.workspace }}/deps --overlay-triplets=${{ github.workspace }}/.github/vcpkg
 
     - name: GCC 11 Configure CMake
-      run: cmake --preset default -B ${{ github.workspace }}/build-11 -DCMAKE_CXX_COMPILER=$(which g++-11) -DASIO_GRPC_ENABLE_CMAKE_INSTALL_TEST=off -DCMAKE_EXPORT_COMPILE_COMMANDS=on -DASIO_GRPC_TEST_COVERAGE=on -DASIO_GRPC_GCOV_PROGRAM=$(which gcov-11) -DASIO_GRPC_COVERAGE_OUTPUT_FILE=${{ github.workspace }}/build-11/sonarqube-coverage.xml -DVCPKG_INSTALLED_DIR=${{ runner.workspace }}/vcpkg_installed ${{ env.CMAKE_EXTRA_ARGS }} ${{ env.CMAKE_ARGS }} -DCMAKE_BUILD_TYPE=Debug -DDCMAKE_UNITY_BUILD=off
+      run: cmake --preset default -B ${{ github.workspace }}/build-11 -DCMAKE_CXX_COMPILER=$(which g++-11) -DASIO_GRPC_ENABLE_CMAKE_INSTALL_TEST=off -DCMAKE_EXPORT_COMPILE_COMMANDS=on -DASIO_GRPC_TEST_COVERAGE=on -DASIO_GRPC_GCOV_PROGRAM=$(which gcov-11) -DASIO_GRPC_COVERAGE_OUTPUT_FILE=${{ github.workspace }}/build-11/sonarqube-coverage.xml -DVCPKG_INSTALLED_DIR=${{ runner.workspace }}/vcpkg_installed ${{ env.CMAKE_EXTRA_ARGS }} ${{ env.CMAKE_ARGS }} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_UNITY_BUILD=off
 
     - name: GCC 11 Build
       run: cmake --build ${{ github.workspace }}/build-11 --config Debug --parallel $(nproc)

diff --git a/test/utils/utils/test.cpp b/test/utils/utils/test.cpp
@@ -30,19 +30,19 @@ void set_up_unary_test(MockTest& test)
             });
     EXPECT_CALL(test.stub, PrepareAsyncUnaryRaw)
         .WillOnce(
-            [reader = std::make_shared<decltype(mock_reader)>(std::move(mock_reader))]
+            [reader = std::move(mock_reader)](auto&&...)
             {
                 // GRPC wraps the return value into a unique_ptr with a specialized std::default_delete that does
                 // nothing
-                return reader->get();
+                return reader.get();
             });
 }
 
 void set_up_server_streaming_test(MockTest& test)
 {
     EXPECT_CALL(test.stub, PrepareAsyncServerStreamingRaw)
         .WillOnce(
-            [&]
+            [&](auto&&...)
             {
                 auto mock_reader = std::make_unique<testing::NiceMock<MockClientAsyncReader>>();
                 EXPECT_CALL(*mock_reader, Read)