From 4e3fec287ca5646c1908c358729ee465cd7fd39e Mon Sep 17 00:00:00 2001 From: Vasily Nemkov Date: Sun, 17 Nov 2024 22:40:41 +0100 Subject: [PATCH 1/7] Try to use 24.3 for tests on Linux --- .github/workflows/linux.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 9f233f98..e4197119 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -15,7 +15,7 @@ on: env: BUILD_TYPE: Release - CLICKHOUSE_SERVER_IMAGE: "clickhouse/clickhouse-server:22.3" + jobs: build: @@ -26,6 +26,7 @@ jobs: compiler: [clang-6, clang-10-libc++, gcc-7, gcc-8, gcc-9] ssl: [ssl_ON, ssl_OFF] dependencies: [dependencies_BUILT_IN] + clickhouse_server_image: ["clickhouse/clickhouse-server:22.3", "clickhouse/clickhouse-server:24.3"] include: - compiler: clang-6 @@ -114,8 +115,8 @@ jobs: - name: Test - Start ClickHouse server in background run: | - docker pull ${CLICKHOUSE_SERVER_IMAGE} - docker run -d --name clickhouse -p 9000:9000 ${CLICKHOUSE_SERVER_IMAGE} + docker pull ${{matrix.clickhouse_server_image}} + docker run -d --name clickhouse -p 9000:9000 ${{matrix.clickhouse_server_image}} docker ps -a docker stats -a --no-stream ## Check and wait until CH is ready to accept connections From 18f22daa91a26424b2cf3532b1eccb6a6d1f1be6 Mon Sep 17 00:00:00 2001 From: Vasily Nemkov Date: Sun, 17 Nov 2024 22:50:56 +0100 Subject: [PATCH 2/7] try to fix dependencies_SYSTEM build --- .github/workflows/linux.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index e4197119..2780aee5 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -26,7 +26,7 @@ jobs: compiler: [clang-6, clang-10-libc++, gcc-7, gcc-8, gcc-9] ssl: [ssl_ON, ssl_OFF] dependencies: [dependencies_BUILT_IN] - clickhouse_server_image: ["clickhouse/clickhouse-server:22.3", "clickhouse/clickhouse-server:24.3"] + clickhouse_server: [CH22.3, CH24.3] include: - compiler: clang-6 @@ -68,6 +68,12 @@ jobs: -D WITH_SYSTEM_LZ4=ON -D WITH_SYSTEM_ABSEIL=ON + - clickhouse_server: CH22.3 + clickhouse_server_image: "clickhouse-server:22.3" + + - clickhouse_server: CH24.3 + clickhouse_server_image: "clickhouse-server:24.3" + runs-on: ${{matrix.os}} steps: From 98be960a24d29da8efb8b981a296c6d34d309b88 Mon Sep 17 00:00:00 2001 From: Vasily Nemkov Date: Mon, 18 Nov 2024 19:08:23 +0100 Subject: [PATCH 3/7] Update linux.yml --- .github/workflows/linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 2780aee5..98321bce 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -69,10 +69,10 @@ jobs: -D WITH_SYSTEM_ABSEIL=ON - clickhouse_server: CH22.3 - clickhouse_server_image: "clickhouse-server:22.3" + clickhouse_server_image: "clickhouse/clickhouse-server:22.3" - clickhouse_server: CH24.3 - clickhouse_server_image: "clickhouse-server:24.3" + clickhouse_server_image: "clickhouse/clickhouse-server:24.3" runs-on: ${{matrix.os}} From 0bd6e4de133ac0275aaaabd9c86505d8ab96a0ff Mon Sep 17 00:00:00 2001 From: Vasily Nemkov Date: Tue, 19 Nov 2024 00:27:16 +0100 Subject: [PATCH 4/7] Update linux.yml --- .github/workflows/linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 98321bce..be66353f 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -25,7 +25,7 @@ jobs: os: [ubuntu-20.04] compiler: [clang-6, clang-10-libc++, gcc-7, gcc-8, gcc-9] ssl: [ssl_ON, ssl_OFF] - dependencies: [dependencies_BUILT_IN] + dependencies: [dependencies_BUILT_IN, dependencies_SYSTEM] clickhouse_server: [CH22.3, CH24.3] include: From 014ec7b9789e3d155492fbcc9a124dd925302d74 Mon Sep 17 00:00:00 2001 From: Vasily Nemkov Date: Tue, 19 Nov 2024 19:24:19 +0100 Subject: [PATCH 5/7] Update linux.yml --- .github/workflows/linux.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index be66353f..6fe158e8 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -57,6 +57,12 @@ jobs: - ssl: ssl_ON SSL_CMAKE_OPTION: -D WITH_OPENSSL=ON + - clickhouse_server: CH22.3 + clickhouse_server_image: "clickhouse/clickhouse-server:22.3" + + - clickhouse_server: CH24.3 + clickhouse_server_image: "clickhouse/clickhouse-server:24.3" + - dependencies: dependencies_SYSTEM compiler: compiler_SYSTEM os: ubuntu-22.04 @@ -67,11 +73,6 @@ jobs: DEPENDENCIES_CMAKE_OPTIONS: >- -D WITH_SYSTEM_LZ4=ON -D WITH_SYSTEM_ABSEIL=ON - - - clickhouse_server: CH22.3 - clickhouse_server_image: "clickhouse/clickhouse-server:22.3" - - - clickhouse_server: CH24.3 clickhouse_server_image: "clickhouse/clickhouse-server:24.3" runs-on: ${{matrix.os}} From 992479fbe41d62819efadadbd43093dd7e977579 Mon Sep 17 00:00:00 2001 From: Vasily Nemkov Date: Tue, 19 Nov 2024 19:32:53 +0100 Subject: [PATCH 6/7] More os versions and compilers --- .github/workflows/linux.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 6fe158e8..155a7496 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -22,8 +22,8 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04] - compiler: [clang-6, clang-10-libc++, gcc-7, gcc-8, gcc-9] + os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04] + compiler: [clang-6, clang-10-libc++, clang-18, gcc-7, gcc-8, gcc-9, gcc-13] ssl: [ssl_ON, ssl_OFF] dependencies: [dependencies_BUILT_IN, dependencies_SYSTEM] clickhouse_server: [CH22.3, CH24.3] From 4ab641ba54d238a629708827e1e7bbc1a511529f Mon Sep 17 00:00:00 2001 From: Vasily Nemkov Date: Tue, 19 Nov 2024 19:38:20 +0100 Subject: [PATCH 7/7] fixed compiler --- .github/workflows/linux.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 155a7496..fcbc4dd0 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -39,6 +39,11 @@ jobs: C_COMPILER: clang-10 CXX_COMPILER: clang++-10 + - compiler: clang-18 + COMPILER_INSTALL: clang-18 libc++-dev + C_COMPILER: clang-18 + CXX_COMPILER: clang++-18 + - compiler: gcc-7 COMPILER_INSTALL: gcc-7 g++-7 C_COMPILER: gcc-7 @@ -54,6 +59,11 @@ jobs: C_COMPILER: gcc-9 CXX_COMPILER: g++-9 + - compiler: gcc-13 + COMPILER_INSTALL: gcc-13 g++-13 + C_COMPILER: gcc-13 + CXX_COMPILER: g++-13 + - ssl: ssl_ON SSL_CMAKE_OPTION: -D WITH_OPENSSL=ON