Skip to content

Commit 511ef1e

Browse files
alexey-milovidovalexey-milovidov
committed
Merge branch 'master' into everything-should-work-on-aarch64
2 parents a6bfe3d + 9a55cdf commit 511ef1e

414 files changed

Lines changed: 9156 additions & 2552 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.editorconfig‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,7 @@ charset = utf-8
1919
indent_style = space
2020
indent_size = 4
2121
trim_trailing_whitespace = true
22+
23+
# Some SQL results have trailing whitespace which is removed by IDEs
24+
[tests/queries/**.reference]
25+
trim_trailing_whitespace = false

‎.github/ISSUE_TEMPLATE/10_question.md‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/10_question.yaml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Question
2+
description: Ask a question about ClickHouse
3+
labels: ["question"]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
> Make sure to check documentation https://clickhouse.com/docs/en/ first. If the question is concise and probably has a short answer, asking it in [community Slack](https://join.slack.com/t/clickhousedb/shared_invite/zt-1gh9ds7f4-PgDhJAaF8ad5RbWBAAjzFg) is probably the fastest way to find the answer. For more complicated questions, consider asking them on StackOverflow with "clickhouse" tag https://stackoverflow.com/questions/tagged/clickhouse
9+
- type: textarea
10+
attributes:
11+
label: Company or project name
12+
description: Put your company name or project description here.
13+
validations:
14+
required: false
15+
- type: textarea
16+
attributes:
17+
label: Question
18+
description: Please put your question here.
19+
validations:
20+
required: true

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,17 @@ At a minimum, the following information should be added (but add more as needed)
4848
- [ ] <!---ci_include_stateful--> Allow: Stateful tests
4949
- [ ] <!---ci_include_integration--> Allow: Integration Tests
5050
- [ ] <!---ci_include_performance--> Allow: Performance tests
51+
- [ ] <!---ci_set_normal_builds--> Allow: Normal Builds
52+
- [ ] <!---ci_set_special_builds--> Allow: Special Builds
5153
- [ ] <!---ci_set_non_required--> Allow: All NOT Required Checks
5254
- [ ] <!---batch_0_1--> Allow: batch 1, 2 for multi-batch jobs
5355
- [ ] <!---batch_2_3--> Allow: batch 3, 4, 5, 6 for multi-batch jobs
5456
---
5557
- [ ] <!---ci_exclude_style--> Exclude: Style check
5658
- [ ] <!---ci_exclude_fast--> Exclude: Fast test
57-
- [ ] <!---ci_exclude_integration--> Exclude: Integration Tests
58-
- [ ] <!---ci_exclude_stateless--> Exclude: Stateless tests
59-
- [ ] <!---ci_exclude_stateful--> Exclude: Stateful tests
60-
- [ ] <!---ci_exclude_performance--> Exclude: Performance tests
6159
- [ ] <!---ci_exclude_asan--> Exclude: All with ASAN
62-
- [ ] <!---ci_exclude_aarch64--> Exclude: All with Aarch64
6360
- [ ] <!---ci_exclude_tsan|msan|ubsan|coverage--> Exclude: All with TSAN, MSAN, UBSAN, Coverage
61+
- [ ] <!---ci_exclude_aarch64|release|debug--> Exclude: All with aarch64, release, debug
6462
---
6563
- [ ] <!---do_not_test--> Do not test
6664
- [ ] <!---upload_all--> Upload binaries for special builds

‎.github/workflows/master.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ jobs:
106106
data: ${{ needs.RunConfig.outputs.data }}
107107
# stage for jobs that do not prohibit merge
108108
Tests_3:
109-
needs: [RunConfig, Builds_1]
109+
# Test_3 should not wait for Test_1/Test_2 and should not be blocked by them on master branch since all jobs need to run there.
110+
needs: [RunConfig, Builds_1, Builds_2]
110111
if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).stages_data.stages_to_do, 'Tests_3') }}
111112
uses: ./.github/workflows/reusable_test_stage.yml
112113
with:

‎.github/workflows/pull_request.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ jobs:
135135
data: ${{ needs.RunConfig.outputs.data }}
136136
# stage for jobs that do not prohibit merge
137137
Tests_3:
138-
needs: [RunConfig, Tests_1, Tests_2]
138+
needs: [RunConfig, Builds_1, Tests_1, Builds_2, Tests_2]
139139
if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).stages_data.stages_to_do, 'Tests_3') }}
140140
uses: ./.github/workflows/reusable_test_stage.yml
141141
with:

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ add_library(global-libs INTERFACE)
122122

123123
include (cmake/sanitize.cmake)
124124

125-
include (cmake/instrument.cmake)
125+
include (cmake/xray_instrumentation.cmake)
126126

127127
option(ENABLE_COLORED_BUILD "Enable colors in compiler output" ON)
128128

‎SECURITY.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ The following versions of ClickHouse server are currently supported with securit
1919
| 24.3 | ✔️ |
2020
| 24.2 | ❌ |
2121
| 24.1 | ❌ |
22-
| 23.* | ❌ |
22+
| 23.12 | ❌ |
23+
| 23.11 | ❌ |
24+
| 23.10 | ❌ |
25+
| 23.9 | ❌ |
2326
| 23.8 | ✔️ |
2427
| 23.7 | ❌ |
2528
| 23.6 | ❌ |

cmake/instrument.cmake renamed to cmake/xray_instrumentation.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ if (NOT ENABLE_XRAY)
77
return()
88
endif()
99

10-
if (NOT (ARCH_AMD64 AND (OS_LINUX OR OS_FREEBSD)))
10+
if (NOT (ARCH_AMD64 AND OS_LINUX))
1111
message (STATUS "Not using LLVM XRay, only amd64 Linux or FreeBSD are supported")
1212
return()
1313
endif()

‎contrib/cld2‎

0 commit comments

Comments
 (0)