Skip to content

Commit 2032264

Browse files
committed
Update ClickHouse version test matrix
Also use the machine OS and architecture for the vendor build directory, to avoid rebuilds of the `clickhouse-cpp` library across between machines and Docker containers.
1 parent ca940d0 commit 2032264

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

.github/workflows/clickhouse.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
# Test latest version and all LTS releases.
1313
# .github/ubuntu/ch-versions --lts --latest-stable --earliest 22 --prefix ' - ' | pbcopy
1414
ch:
15-
- 25.9.3.48-stable
16-
- 25.8.10.7-lts
17-
- 25.3.6.56-lts
15+
- 25.11.2.24-stable
16+
- 25.8.12.129-lts
17+
- 25.3.9.72-lts
1818
- 24.8.14.39-lts
1919
- 24.3.18.7-lts
2020
- 23.8.16.40-lts

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ OBJS = $(sort \
2424

2525
# clickhouse-cpp source and build directories.
2626
CH_CPP_DIR = vendor/clickhouse-cpp
27-
CH_CPP_BUILD_DIR = vendor/_build
27+
MACHINE = $(shell echo "$$(uname -s)-$$(uname -m)" | tr '[:upper:]' '[:lower:]')
28+
CH_CPP_BUILD_DIR = vendor/_build/$(MACHINE)
2829

2930
# List the clickhouse-cpp libraries we require.
3031
CH_CPP_LIB = $(CH_CPP_BUILD_DIR)/clickhouse/libclickhouse-cpp-lib$(DLSUFFIX)

0 commit comments

Comments
 (0)