Skip to content

Commit 3de797c

Browse files
committed
fix testing
1 parent 6ee9144 commit 3de797c

File tree

7 files changed

+44
-12
lines changed

7 files changed

+44
-12
lines changed

.docker/clickhouse/cluster/server1_config.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
1616
<user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
1717
<access_control_path>/var/lib/clickhouse/access/</access_control_path>
18+
<format_schema_path>/var/lib/clickhouse/format_schemas/</format_schema_path>
1819
<keep_alive_timeout>3</keep_alive_timeout>
1920

2021
<logger>
@@ -114,4 +115,11 @@
114115
<value>86400</value>
115116
</header>
116117
</http_options_response>
118+
119+
<user_directories>
120+
<users_xml>
121+
<path>users.xml</path>
122+
</users_xml>
123+
</user_directories>
124+
117125
</clickhouse>

.docker/clickhouse/cluster/server2_config.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
1616
<user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
1717
<access_control_path>/var/lib/clickhouse/access/</access_control_path>
18+
<format_schema_path>/var/lib/clickhouse/format_schemas/</format_schema_path>
1819
<keep_alive_timeout>3</keep_alive_timeout>
1920

2021
<logger>
@@ -114,4 +115,11 @@
114115
<value>86400</value>
115116
</header>
116117
</http_options_response>
118+
119+
<user_directories>
120+
<users_xml>
121+
<path>users.xml</path>
122+
</users_xml>
123+
</user_directories>
124+
117125
</clickhouse>

.docker/clickhouse/single/config.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
1515
<user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
1616
<access_control_path>/var/lib/clickhouse/access/</access_control_path>
17+
<format_schema_path>/var/lib/clickhouse/format_schemas/</format_schema_path>
1718
<keep_alive_timeout>3</keep_alive_timeout>
1819

1920
<logger>
@@ -51,4 +52,10 @@
5152
</header>
5253
</http_options_response>
5354

55+
<user_directories>
56+
<users_xml>
57+
<path>users.xml</path>
58+
</users_xml>
59+
</user_directories>
60+
5461
</clickhouse>

.docker/clickhouse/users.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,17 @@
88
</profiles>
99

1010
<users>
11+
<test>
12+
<password>test</password>
13+
<networks>
14+
<ip>::/0</ip>
15+
</networks>
16+
<profile>default</profile>
17+
<quota>default</quota>
18+
<access_management>1</access_management>
19+
</test>
1120
<default>
12-
<password></password>
21+
<password />
1322
<networks>
1423
<ip>::/0</ip>
1524
</networks>

.docker/docker-compose.cluster.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
clickhouse1:
3-
image: 'clickhouse/clickhouse-server:${CLICKHOUSE_VERSION-23.11-alpine}'
3+
image: 'clickhouse/clickhouse-server:${CLICKHOUSE_VERSION}'
44
ulimits:
55
nofile:
66
soft: 262144
@@ -18,7 +18,7 @@ services:
1818
interval: 5s
1919

2020
clickhouse2:
21-
image: 'clickhouse/clickhouse-server:${CLICKHOUSE_VERSION-23.11-alpine}'
21+
image: 'clickhouse/clickhouse-server:${CLICKHOUSE_VERSION}'
2222
ulimits:
2323
nofile:
2424
soft: 262144

.docker/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
clickhouse:
3-
image: 'clickhouse/clickhouse-server:${CLICKHOUSE_VERSION-23.11-alpine}'
3+
image: 'clickhouse/clickhouse-server:${CLICKHOUSE_VERSION}'
44
container_name: 'clickhouse-activerecord-clickhouse-server'
55
ports:
66
- '18123:8123'

.github/workflows/testing.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ jobs:
1414
env:
1515
CLICKHOUSE_PORT: 18123
1616
CLICKHOUSE_DATABASE: default
17+
CLICKHOUSE_USER: test
18+
CLICKHOUSE_PASSWORD: test
1719

1820
strategy:
1921
fail-fast: true
@@ -22,8 +24,6 @@ jobs:
2224
version:
2325
- ruby: 2.7
2426
rails: 7.1.3
25-
- ruby: 3.0
26-
rails: 7.1.3
2727
- ruby: 3.2
2828
rails: 7.1.3
2929
- ruby: 3.2
@@ -32,13 +32,13 @@ jobs:
3232
rails: 8.0.1
3333
- ruby: 3.2
3434
rails: 8.1
35-
clickhouse: [ '24.9' ]
35+
clickhouse: [ '24.9', '25.10' ]
3636

3737
steps:
3838
- uses: actions/checkout@v4
3939

4040
- name: Start ClickHouse ${{ matrix.clickhouse }}
41-
uses: hoverkraft-tech/compose-action@v2.1.0
41+
uses: hoverkraft-tech/compose-action@v2.4.1
4242
env:
4343
CLICKHOUSE_VERSION: ${{ matrix.clickhouse }}
4444
with:
@@ -63,6 +63,8 @@ jobs:
6363
CLICKHOUSE_PORT: 28123
6464
CLICKHOUSE_DATABASE: default
6565
CLICKHOUSE_CLUSTER: test_cluster
66+
CLICKHOUSE_USER: test
67+
CLICKHOUSE_PASSWORD: test
6668

6769
strategy:
6870
fail-fast: true
@@ -71,8 +73,6 @@ jobs:
7173
version:
7274
- ruby: 2.7
7375
rails: 7.1.3
74-
- ruby: 3.0
75-
rails: 7.1.3
7676
- ruby: 3.2
7777
rails: 7.1.3
7878
- ruby: 3.2
@@ -81,13 +81,13 @@ jobs:
8181
rails: 8.0.1
8282
- ruby: 3.2
8383
rails: 8.1
84-
clickhouse: [ '24.9' ]
84+
clickhouse: [ '24.9', '25.10' ]
8585

8686
steps:
8787
- uses: actions/checkout@v4
8888

8989
- name: Start ClickHouse Cluster ${{ matrix.clickhouse }}
90-
uses: hoverkraft-tech/compose-action@v2.1.0
90+
uses: hoverkraft-tech/compose-action@v2.4.1
9191
env:
9292
CLICKHOUSE_VERSION: ${{ matrix.clickhouse }}
9393
with:

0 commit comments

Comments
 (0)