Skip to content

GCC-8 support fix #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,36 @@ on:
env:
BUILD_TYPE: Release
CH_SERVER_VERSION: 21.3.17.2

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
build: [gcc-7, clang-6]
build: [clang-6, gcc-7, gcc-8, gcc-9]
include:
- build: clang-6
os: ubuntu-latest
INSTALL: clang-6.0
C_COMPILER: clang-6.0
CXX_COMPILER: clang++-6.0

- build: gcc-7
os: ubuntu-latest
INSTALL: gcc-7 g++-7
C_COMPILER: gcc-7
CXX_COMPILER: g++-7

- build: clang-6
- build: gcc-8
os: ubuntu-latest
INSTALL: clang-6.0
C_COMPILER: clang-6.0
CXX_COMPILER: clang++-6.0
INSTALL: gcc-8 g++-8
C_COMPILER: gcc-8
CXX_COMPILER: g++-8

- build: gcc-9
os: ubuntu-latest
INSTALL: gcc-9 g++-9
C_COMPILER: gcc-9
CXX_COMPILER: g++-9

steps:
- uses: actions/checkout@v2
Expand Down
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ PROJECT (CLICKHOUSE-CLIENT)
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
ENDIF ()
SET (CMAKE_EXE_LINKER_FLAGS, "${CMAKE_EXE_LINKER_FLAGS} -lpthread")
# -Wpedantic makes int128 support somewhat harder and less performant (by not allowing builtin __int128)
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror")
ENDIF ()

Expand Down
2 changes: 1 addition & 1 deletion clickhouse/base/sslsocket.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ SSL_CTX * SSLContext::getContext() {
#define HANDLE_SSL_ERROR(SSL_PTR, statement) [&] { \
if (const auto ret_code = (statement); ret_code <= 0) { \
throwSSLError(SSL_PTR, SSL_get_error(SSL_PTR, ret_code), LOCATION, #statement); \
return static_cast<decltype(ret_code)>(0); \
return static_cast<std::decay_t<decltype(ret_code)>>(0); \
} \
else \
return ret_code; \
Expand Down