Skip to content

Commit 8b7b233

Browse files
authored
Merge branch 'ClickHouse:master' into master
2 parents fc2d776 + 99df682 commit 8b7b233

File tree

1,954 files changed

+69727
-29174
lines changed

Some content is hidden

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

1,954 files changed

+69727
-29174
lines changed

.clang-tidy

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77

88
HeaderFilterRegex: '^.*/(base|src|programs|utils)/.*(h|hpp)$'
99

10+
# We don't want to use clang-tidy diagnostics in the "contrib" folder.
11+
ExcludeHeaderFilterRegex: '^.*/contrib/.*'
12+
1013
Checks: [
1114
'*',
1215

.github/workflows/backport_branches.yml

Lines changed: 83 additions & 121 deletions
Large diffs are not rendered by default.

.github/workflows/master.yml

Lines changed: 255 additions & 407 deletions
Large diffs are not rendered by default.

.github/workflows/nightly_fuzzers.yml

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ jobs:
167167
fi
168168
169169
libfuzzer_tests:
170-
runs-on: [self-hosted, func-tester-aarch64]
170+
runs-on: [self-hosted, arm-medium]
171171
needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_fuzzers]
172172
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'bGliRnV6emVyIHRlc3Rz') }}
173173
name: "libFuzzer tests"
@@ -203,3 +203,41 @@ jobs:
203203
else
204204
python3 -m praktika run 'libFuzzer tests' --workflow "NightlyFuzzers" --ci |& tee ./ci/tmp/job.log
205205
fi
206+
207+
finish_workflow:
208+
runs-on: [self-hosted, style-checker-aarch64]
209+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_fuzzers, libfuzzer_tests]
210+
if: ${{ !cancelled() }}
211+
name: "Finish Workflow"
212+
outputs:
213+
data: ${{ steps.run.outputs.DATA }}
214+
steps:
215+
- name: Checkout code
216+
uses: actions/checkout@v4
217+
with:
218+
ref: ${{ env.CHECKOUT_REF }}
219+
220+
- name: Prepare env script
221+
run: |
222+
rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
223+
mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
224+
cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
225+
export PYTHONPATH=./ci:.:
226+
cat > ./ci/tmp/workflow_config_nightlyfuzzers.json << 'EOF'
227+
${{ needs.config_workflow.outputs.data }}
228+
EOF
229+
cat > ./ci/tmp/workflow_status.json << 'EOF'
230+
${{ toJson(needs) }}
231+
EOF
232+
ENV_SETUP_SCRIPT_EOF
233+
234+
- name: Run
235+
id: run
236+
run: |
237+
. ./ci/tmp/praktika_setup_env.sh
238+
set -o pipefail
239+
if command -v ts &> /dev/null; then
240+
python3 -m praktika run 'Finish Workflow' --workflow "NightlyFuzzers" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
241+
else
242+
python3 -m praktika run 'Finish Workflow' --workflow "NightlyFuzzers" --ci |& tee ./ci/tmp/job.log
243+
fi

.github/workflows/nightly_jepsen.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,3 +203,41 @@ jobs:
203203
else
204204
python3 -m praktika run 'ClickHouse Keeper Jepsen' --workflow "NightlyJepsen" --ci |& tee ./ci/tmp/job.log
205205
fi
206+
207+
finish_workflow:
208+
runs-on: [self-hosted, style-checker-aarch64]
209+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_binary, clickhouse_keeper_jepsen]
210+
if: ${{ !cancelled() }}
211+
name: "Finish Workflow"
212+
outputs:
213+
data: ${{ steps.run.outputs.DATA }}
214+
steps:
215+
- name: Checkout code
216+
uses: actions/checkout@v4
217+
with:
218+
ref: ${{ env.CHECKOUT_REF }}
219+
220+
- name: Prepare env script
221+
run: |
222+
rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
223+
mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
224+
cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
225+
export PYTHONPATH=./ci:.:
226+
cat > ./ci/tmp/workflow_config_nightlyjepsen.json << 'EOF'
227+
${{ needs.config_workflow.outputs.data }}
228+
EOF
229+
cat > ./ci/tmp/workflow_status.json << 'EOF'
230+
${{ toJson(needs) }}
231+
EOF
232+
ENV_SETUP_SCRIPT_EOF
233+
234+
- name: Run
235+
id: run
236+
run: |
237+
. ./ci/tmp/praktika_setup_env.sh
238+
set -o pipefail
239+
if command -v ts &> /dev/null; then
240+
python3 -m praktika run 'Finish Workflow' --workflow "NightlyJepsen" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
241+
else
242+
python3 -m praktika run 'Finish Workflow' --workflow "NightlyJepsen" --ci |& tee ./ci/tmp/job.log
243+
fi

.github/workflows/nightly_statistics.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ jobs:
3333
mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
3434
cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
3535
export PYTHONPATH=./ci:.:
36-
36+
cat > ./ci/tmp/workflow_config_nightlystatistics.json << 'EOF'
37+
${{ needs.config_workflow.outputs.data }}
38+
EOF
3739
cat > ./ci/tmp/workflow_status.json << 'EOF'
3840
${{ toJson(needs) }}
3941
EOF
@@ -68,7 +70,9 @@ jobs:
6870
mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
6971
cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
7072
export PYTHONPATH=./ci:.:
71-
73+
cat > ./ci/tmp/workflow_config_nightlystatistics.json << 'EOF'
74+
${{ needs.config_workflow.outputs.data }}
75+
EOF
7276
cat > ./ci/tmp/workflow_status.json << 'EOF'
7377
${{ toJson(needs) }}
7478
EOF

0 commit comments

Comments
 (0)