From f78f0f2e1e2bf7a91fabfc3c8027b66e251284b5 Mon Sep 17 00:00:00 2001 From: German Date: Wed, 14 Feb 2024 00:54:49 +0300 Subject: [PATCH] Workflows fixed --- .github/workflows/linux.yml | 2 +- .github/workflows/macos.yml | 2 +- .github/workflows/windows_mingw.yml | 6 +++--- .github/workflows/windows_msvc.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 9f233f98..db7f8288 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -99,7 +99,7 @@ jobs: -D CMAKE_C_COMPILER=${{matrix.C_COMPILER}} \ -D CMAKE_CXX_COMPILER=${{matrix.CXX_COMPILER}} \ -D CMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \ - -D BUILD_TESTS=ON \ + -D CLICKHOUSE_CPP_BUILD_TESTS=ON \ ${{matrix.SSL_CMAKE_OPTION}} \ ${{matrix.DEPENDENCIES_CMAKE_OPTIONS}} \ -S ${{github.workspace}} \ diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index b3faae21..b6d36e5b 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -47,7 +47,7 @@ jobs: run: | cmake \ -D CMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \ - -D BUILD_TESTS=ON \ + -D CLICKHOUSE_CPP_BUILD_TESTS=ON \ ${{matrix.SSL_CMAKE_OPTION}} \ -S ${{github.workspace}} \ -B ${{github.workspace}}/build diff --git a/.github/workflows/windows_mingw.yml b/.github/workflows/windows_mingw.yml index 5681c7c4..6cff77fd 100644 --- a/.github/workflows/windows_mingw.yml +++ b/.github/workflows/windows_mingw.yml @@ -73,9 +73,9 @@ jobs: tar - name: Configure CMake - run: cmake -B build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_TESTS=ON -DCHECK_VERSION=OFF - # -DWITH_OPENSSL=ON was not able to make it work (some strange issues with CA paths, need debug) - # -DCHECK_VERSION=OFF since it requires git, which can't be found from within cmake for some reason. + run: cmake -B build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCLICKHOUSE_CPP_BUILD_TESTS=ON -DCLICKHOUSE_CPP_CHECK_VERSION=OFF + # -DCLICKHOUSE_CPP_WITH_OPENSSL=ON was not able to make it work (some strange issues with CA paths, need debug) + # -DCLICKHOUSE_CPP_CHECK_VERSION=OFF since it requires git, which can't be found from within cmake for some reason. - name: Build run: cmake --build build --config ${{env.BUILD_TYPE}} --target all diff --git a/.github/workflows/windows_msvc.yml b/.github/workflows/windows_msvc.yml index 47fb6764..056bf976 100644 --- a/.github/workflows/windows_msvc.yml +++ b/.github/workflows/windows_msvc.yml @@ -48,7 +48,7 @@ jobs: - uses: ilammy/msvc-dev-cmd@v1 - name: Configure CMake - run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_TESTS=ON + run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCLICKHOUSE_CPP_BUILD_TESTS=ON - name: Build run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}