Skip to content

Commit a9e9fd2

Browse files
EnmkEnmk
authored
Merge pull request #148 from Altinity/customizations/22.3
Pre-release PR 22.3.6
2 parents 3e44e82 + 8b8d838 commit a9e9fd2

27 files changed

+190
-1568
lines changed

‎.github/workflows/release_branches.yml‎

Lines changed: 34 additions & 1444 deletions
Large diffs are not rendered by default.

‎cmake/autogenerated_versions.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
# NOTE: has nothing common with DBMS_TCP_PROTOCOL_VERSION,
44
# only DBMS_TCP_PROTOCOL_VERSION should be incremented on protocol changes.
5-
SET(VERSION_REVISION 54460)
5+
SET(VERSION_REVISION 6)
66
SET(VERSION_MAJOR 22)
77
SET(VERSION_MINOR 3)
88
SET(VERSION_PATCH 6)
99
SET(VERSION_GITHASH 438b4a81f77c98b0dd959e19cfa4b62cabf549d6)
10-
SET(VERSION_DESCRIBE v22.3.6.5-lts)
11-
SET(VERSION_STRING 22.3.6.5)
10+
SET(VERSION_DESCRIBE v22.3.6.6.altinitystable)
11+
SET(VERSION_STRING 22.3.6.6.altinitystable)
1212
# end of autochange

‎cmake/version.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ set (VERSION_STRING_SHORT "${VERSION_MAJOR}.${VERSION_MINOR}")
1919
math (EXPR VERSION_INTEGER "${VERSION_PATCH} + ${VERSION_MINOR}*1000 + ${VERSION_MAJOR}*1000000")
2020

2121
if(CLICKHOUSE_OFFICIAL_BUILD)
22-
set(VERSION_OFFICIAL " (official build)")
22+
set(VERSION_OFFICIAL " (Altinity build)")
2323
endif()

‎docker/images.json‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,164 +1,164 @@
11
{
22
"docker/packager/deb": {
3-
"name": "clickhouse/deb-builder",
3+
"name": "altinityinfra/deb-builder",
44
"dependent": []
55
},
66
"docker/packager/binary": {
7-
"name": "clickhouse/binary-builder",
7+
"name": "altinityinfra/binary-builder",
88
"dependent": [
99
"docker/test/split_build_smoke_test",
1010
"docker/test/codebrowser"
1111
]
1212
},
1313
"docker/test/compatibility/centos": {
14-
"name": "clickhouse/test-old-centos",
14+
"name": "altinityinfra/test-old-centos",
1515
"dependent": []
1616
},
1717
"docker/test/compatibility/ubuntu": {
18-
"name": "clickhouse/test-old-ubuntu",
18+
"name": "altinityinfra/test-old-ubuntu",
1919
"dependent": []
2020
},
2121
"docker/test/integration/base": {
22-
"name": "clickhouse/integration-test",
22+
"name": "altinityinfra/integration-test",
2323
"dependent": []
2424
},
2525
"docker/test/fuzzer": {
26-
"name": "clickhouse/fuzzer",
26+
"name": "altinityinfra/fuzzer",
2727
"dependent": []
2828
},
2929
"docker/test/performance-comparison": {
30-
"name": "clickhouse/performance-comparison",
30+
"name": "altinityinfra/performance-comparison",
3131
"dependent": []
3232
},
3333
"docker/test/util": {
34-
"name": "clickhouse/test-util",
34+
"name": "altinityinfra/test-util",
3535
"dependent": [
3636
"docker/test/base",
3737
"docker/test/fasttest"
3838
]
3939
},
4040
"docker/test/stateless": {
41-
"name": "clickhouse/stateless-test",
41+
"name": "altinityinfra/stateless-test",
4242
"dependent": [
4343
"docker/test/stateful",
4444
"docker/test/unit"
4545
]
4646
},
4747
"docker/test/stateful": {
48-
"name": "clickhouse/stateful-test",
48+
"name": "altinityinfra/stateful-test",
4949
"dependent": [
5050
"docker/test/stress"
5151
]
5252
},
5353
"docker/test/unit": {
54-
"name": "clickhouse/unit-test",
54+
"name": "altinityinfra/unit-test",
5555
"dependent": []
5656
},
5757
"docker/test/stress": {
58-
"name": "clickhouse/stress-test",
58+
"name": "altinityinfra/stress-test",
5959
"dependent": []
6060
},
6161
"docker/test/split_build_smoke_test": {
62-
"name": "clickhouse/split-build-smoke-test",
62+
"name": "altinityinfra/split-build-smoke-test",
6363
"dependent": []
6464
},
6565
"docker/test/codebrowser": {
66-
"name": "clickhouse/codebrowser",
66+
"name": "altinityinfra/codebrowser",
6767
"dependent": []
6868
},
6969
"docker/test/integration/runner": {
7070
"only_amd64": true,
71-
"name": "clickhouse/integration-tests-runner",
71+
"name": "altinityinfra/integration-tests-runner",
7272
"dependent": []
7373
},
7474
"docker/test/testflows/runner": {
75-
"name": "clickhouse/testflows-runner",
75+
"name": "altinityinfra/testflows-runner",
7676
"dependent": []
7777
},
7878
"docker/test/fasttest": {
79-
"name": "clickhouse/fasttest",
79+
"name": "altinityinfra/fasttest",
8080
"dependent": []
8181
},
8282
"docker/test/style": {
83-
"name": "clickhouse/style-test",
83+
"name": "altinityinfra/style-test",
8484
"dependent": []
8585
},
8686
"docker/test/integration/s3_proxy": {
87-
"name": "clickhouse/s3-proxy",
87+
"name": "altinityinfra/s3-proxy",
8888
"dependent": []
8989
},
9090
"docker/test/integration/resolver": {
91-
"name": "clickhouse/python-bottle",
91+
"name": "altinityinfra/python-bottle",
9292
"dependent": []
9393
},
9494
"docker/test/integration/helper_container": {
95-
"name": "clickhouse/integration-helper",
95+
"name": "altinityinfra/integration-helper",
9696
"dependent": []
9797
},
9898
"docker/test/integration/mysql_golang_client": {
99-
"name": "clickhouse/mysql-golang-client",
99+
"name": "altinityinfra/mysql-golang-client",
100100
"dependent": []
101101
},
102102
"docker/test/integration/dotnet_client": {
103-
"name": "clickhouse/dotnet-client",
103+
"name": "altinityinfra/dotnet-client",
104104
"dependent": []
105105
},
106106
"docker/test/integration/mysql_java_client": {
107-
"name": "clickhouse/mysql-java-client",
107+
"name": "altinityinfra/mysql-java-client",
108108
"dependent": []
109109
},
110110
"docker/test/integration/mysql_js_client": {
111-
"name": "clickhouse/mysql-js-client",
111+
"name": "altinityinfra/mysql-js-client",
112112
"dependent": []
113113
},
114114
"docker/test/integration/mysql_php_client": {
115-
"name": "clickhouse/mysql-php-client",
115+
"name": "altinityinfra/mysql-php-client",
116116
"dependent": []
117117
},
118118
"docker/test/integration/postgresql_java_client": {
119-
"name": "clickhouse/postgresql-java-client",
119+
"name": "altinityinfra/postgresql-java-client",
120120
"dependent": []
121121
},
122122
"docker/test/integration/kerberos_kdc": {
123123
"only_amd64": true,
124-
"name": "clickhouse/kerberos-kdc",
124+
"name": "altinityinfra/kerberos-kdc",
125125
"dependent": []
126126
},
127127
"docker/test/base": {
128-
"name": "clickhouse/test-base",
129-
"dependent": [
128+
"name": "altinityinfra/test-base",
129+
"dependent": [
130130
"docker/test/stateless",
131131
"docker/test/integration/base",
132132
"docker/test/fuzzer",
133133
"docker/test/keeper-jepsen"
134-
]
134+
]
135135
},
136136
"docker/test/integration/kerberized_hadoop": {
137137
"only_amd64": true,
138-
"name": "clickhouse/kerberized-hadoop",
138+
"name": "altinityinfra/kerberized-hadoop",
139139
"dependent": []
140140
},
141141
"docker/test/sqlancer": {
142-
"name": "clickhouse/sqlancer-test",
142+
"name": "altinityinfra/sqlancer-test",
143143
"dependent": []
144144
},
145145
"docker/test/keeper-jepsen": {
146-
"name": "clickhouse/keeper-jepsen-test",
146+
"name": "altinityinfra/keeper-jepsen-test",
147147
"dependent": []
148148
},
149149
"docker/docs/builder": {
150-
"name": "clickhouse/docs-builder",
150+
"name": "altinityinfra/docs-builder",
151151
"dependent": [
152152
"docker/docs/check",
153153
"docker/docs/release"
154154
]
155155
},
156156
"docker/docs/check": {
157-
"name": "clickhouse/docs-check",
157+
"name": "altinityinfra/docs-check",
158158
"dependent": []
159159
},
160160
"docker/docs/release": {
161-
"name": "clickhouse/docs-release",
161+
"name": "altinityinfra/docs-release",
162162
"dependent": []
163163
}
164164
}

‎docker/packager/binary/build.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ ln -sf darwin-x86_64 build/cmake/toolchain/darwin-aarch64
1919
# export CCACHE_LOGFILE=/build/ccache.log
2020
# export CCACHE_DEBUG=1
2121

22+
# https://stackoverflow.com/a/71940133
23+
git config --global --add safe.directory '*'
24+
2225
mkdir -p build/build_docker
2326
cd build/build_docker
2427
rm -f CMakeCache.txt

‎docker/packager/packager‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ if __name__ == "__main__":
331331
args.output_dir = os.path.abspath(os.path.join(os.getcwd(), args.output_dir))
332332

333333
image_type = "binary" if args.package_type == "performance" else args.package_type
334-
image_name = "clickhouse/binary-builder"
334+
image_name = "altinityinfra/binary-builder"
335335

336336
if not os.path.isabs(args.clickhouse_repo_path):
337337
ch_root = os.path.abspath(os.path.join(os.getcwd(), args.clickhouse_repo_path))

‎docker/test/stateful/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# rebuild in #33610
22
# docker build -t clickhouse/stateful-test .
33
ARG FROM_TAG=latest
4+
# TODO consider replacing clickhouse with altinityinfra dockerhub account
45
FROM clickhouse/stateless-test:$FROM_TAG
56

67
RUN apt-get update -y \

‎packages/clickhouse-client.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ name: "clickhouse-client"
44
arch: "all"
55
platform: "linux"
66
version: "${CLICKHOUSE_VERSION_STRING}"
7-
vendor: "ClickHouse Inc."
8-
homepage: "https://clickhouse.com"
7+
vendor: "Altinity Inc."
8+
homepage: "https://altinity.com/"
99
license: "Apache"
1010
section: "database"
1111
priority: "optional"

‎packages/clickhouse-common-static-dbg.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ name: "clickhouse-common-static-dbg"
44
arch: "${DEB_ARCH}" # amd64, arm64
55
platform: "linux"
66
version: "${CLICKHOUSE_VERSION_STRING}"
7-
vendor: "ClickHouse Inc."
8-
homepage: "https://clickhouse.com"
7+
vendor: "Altinity Inc."
8+
homepage: "https://altinity.com/"
99
license: "Apache"
1010
section: "database"
1111
priority: "optional"

‎packages/clickhouse-common-static.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ name: "clickhouse-common-static"
44
arch: "${DEB_ARCH}" # amd64, arm64
55
platform: "linux"
66
version: "${CLICKHOUSE_VERSION_STRING}"
7-
vendor: "ClickHouse Inc."
8-
homepage: "https://clickhouse.com"
7+
vendor: "Altinity Inc."
8+
homepage: "https://altinity.com/"
99
license: "Apache"
1010
section: "database"
1111
priority: "optional"

0 commit comments

Comments
 (0)