Skip to content

Commit 218491d

Browse files
committed
enable CI
1 parent a02afcb commit 218491d

File tree

3 files changed

+19
-24
lines changed

3 files changed

+19
-24
lines changed

.github/workflows/clickhouse_ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ jobs:
3232
env:
3333
CLICKHOUSE_CONNECT_TEST_PORT: 8443
3434
CLICKHOUSE_CONNECT_TEST_CLOUD: 'True'
35-
CLICKHOUSE_CONNECT_TEST_HOST: ${{ secrets.INTEGRATIONS_TEAM_TESTS_CLOUD_HOST_SMT }}
36-
CLICKHOUSE_CONNECT_TEST_PASSWORD: ${{ secrets.INTEGRATIONS_TEAM_TESTS_CLOUD_PASSWORD_SMT }}
37-
CLICKHOUSE_CONNECT_TEST_JWT_SECRET: ${{ secrets.INTEGRATIONS_TEAM_TESTS_CLOUD_JWT_PRIVATE_KEY }}
35+
# CLICKHOUSE_CONNECT_TEST_HOST: ${{ secrets.INTEGRATIONS_TEAM_TESTS_CLOUD_HOST_SMT }}
36+
# CLICKHOUSE_CONNECT_TEST_PASSWORD: ${{ secrets.INTEGRATIONS_TEAM_TESTS_CLOUD_PASSWORD_SMT }}
37+
# CLICKHOUSE_CONNECT_TEST_JWT_SECRET: ${{ secrets.INTEGRATIONS_TEAM_TESTS_CLOUD_JWT_PRIVATE_KEY }}
3838
run: pytest tests/integration_tests
3939

4040
- name: Run ClickHouse Container (LATEST)
41-
run: CLICKHOUSE_CONNECT_TEST_CH_VERSION=latest docker compose up -d clickhouse
41+
run: TIMEPLUS_CONNECT_TEST_TP_VERSION=latest docker compose up -d clickhouse
4242
- name: Run LATEST tests
4343
run: pytest tests/integration_tests
4444
- name: remove latest container

.github/workflows/on_push.yml

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: 'Lint and Test'
33
on:
44
pull_request:
55
branches:
6-
- main
6+
- timeplus
77
paths-ignore:
88
- 'VERSION'
99
- 'LICENSE'
@@ -19,7 +19,7 @@ on:
1919
- '*_dev'
2020
- '*_build'
2121
- 'release_*'
22-
- main
22+
- timeplus
2323
paths-ignore:
2424
- 'VERSION'
2525
- 'LICENSE'
@@ -49,7 +49,7 @@ jobs:
4949
python setup.py build_ext --inplace
5050
- name: Run Pylint
5151
run: |
52-
pylint clickhouse_connect
52+
pylint timeplus_connect
5353
pylint tests
5454
pylint examples
5555
@@ -64,22 +64,17 @@ jobs:
6464
- '3.11'
6565
- '3.12'
6666
- '3.13'
67-
clickhouse-version:
68-
- '24.3'
69-
- '24.8'
70-
- '24.9'
71-
- '24.10'
72-
- '24.11'
67+
timeplus-version:
7368
- latest
7469

75-
name: Local Tests Py=${{ matrix.python-version }} CH=${{ matrix.clickhouse-version }}
70+
name: Local Tests Py=${{ matrix.python-version }} CH=${{ matrix.timeplus-version }}
7671
steps:
7772
- name: Checkout
7873
uses: actions/checkout@v4
79-
- name: Start ClickHouse (version - ${{ matrix.clickhouse-version }}) in Docker
74+
- name: Start ClickHouse (version - ${{ matrix.timeplus-version }}) in Docker
8075
uses: hoverkraft-tech/compose-action@v2.0.0
8176
env:
82-
CLICKHOUSE_CONNECT_TEST_CH_VERSION: ${{ matrix.clickhouse-version }}
77+
TIMEPLUS_CONNECT_TEST_TP_VERSION: ${{ matrix.timeplus-version }}
8378
with:
8479
compose-file: 'docker-compose.yml'
8580
down-flags: '--volumes'
@@ -150,8 +145,8 @@ jobs:
150145
CLICKHOUSE_CONNECT_TEST_FUZZ: 10
151146
CLICKHOUSE_CONNECT_TEST_CLOUD: 'True'
152147
CLICKHOUSE_CONNECT_TEST_PORT: 8443
153-
CLICKHOUSE_CONNECT_TEST_HOST: ${{ secrets.INTEGRATIONS_TEAM_TESTS_CLOUD_HOST_SMT }}
154-
CLICKHOUSE_CONNECT_TEST_PASSWORD: ${{ secrets.INTEGRATIONS_TEAM_TESTS_CLOUD_PASSWORD_SMT }}
155-
CLICKHOUSE_CONNECT_TEST_JWT_SECRET: ${{ secrets.INTEGRATIONS_TEAM_TESTS_CLOUD_JWT_PRIVATE_KEY }}
148+
# CLICKHOUSE_CONNECT_TEST_HOST: ${{ secrets.INTEGRATIONS_TEAM_TESTS_CLOUD_HOST_SMT }}
149+
# CLICKHOUSE_CONNECT_TEST_PASSWORD: ${{ secrets.INTEGRATIONS_TEAM_TESTS_CLOUD_PASSWORD_SMT }}
150+
# CLICKHOUSE_CONNECT_TEST_JWT_SECRET: ${{ secrets.INTEGRATIONS_TEAM_TESTS_CLOUD_JWT_PRIVATE_KEY }}
156151
SQLALCHEMY_SILENCE_UBER_WARNING: 1
157152
run: pytest tests/integration_tests

docker-compose.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
services:
22
clickhouse:
3-
image: 'clickhouse/clickhouse-server:${CLICKHOUSE_CONNECT_TEST_CH_VERSION-24.8-alpine}'
4-
container_name: 'clickhouse-connect-clickhouse-server'
3+
image: "timeplus/timeplusd:latest"
4+
container_name: 'timeplus-connect-timeplus-server'
55
ports:
6+
- '8463:8463'
67
- '8123:8123'
7-
- '9000:9000'
8+
- '3218:3218'
89
ulimits:
910
nofile:
1011
soft: 262144
1112
hard: 262144
1213
volumes:
13-
- './.docker/clickhouse/single_node/config.xml:/etc/clickhouse-server/config.xml'
14-
- './.docker/clickhouse/users.xml:/etc/clickhouse-server/users.xml'
14+
- /mnt/timeplusd:/var/lib/timeplusd
1515

1616
clickhouse_tls:
1717
build:

0 commit comments

Comments
 (0)