Skip to content

Commit 6ba9dd0

Browse files
authored
Merge branch 'ClickHouse:master' into opt_concat_blocks
2 parents 21b3913 + 7de87da commit 6ba9dd0

File tree

3,685 files changed

+356670
-170388
lines changed

Some content is hidden

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

3,685 files changed

+356670
-170388
lines changed

.github/ISSUE_TEMPLATE/85_bug-report.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ body:
3838
> Change "enabled" to true in "send_crash_reports" section in `config.xml`:
3939
```xml
4040
<send_crash_reports>
41-
<!-- Changing <enabled> to true allows sending crash reports to -->
42-
<!-- the ClickHouse core developers team via Sentry https://sentry.io -->
43-
<enabled>false</enabled>
41+
<!-- Changing <enabled> to true allows sending crash reports to -->
42+
<!-- the ClickHouse core developers team. -->
43+
<enabled>true</enabled>
4444
</send_crash_reports>
4545
```
4646
-----

.github/workflows/backport_branches.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -625,11 +625,11 @@ jobs:
625625
python3 -m praktika run 'Compatibility check (aarch64)' --workflow "BackportPR" --ci |& tee ./ci/tmp/job.log
626626
fi
627627
628-
stateless_tests_asan_1_2:
628+
stateless_tests_asan_distributed_plan_1_2:
629629
runs-on: [self-hosted, func-tester]
630630
needs: [config_workflow, dockers_build_amd_and_merge, build_amd_asan]
631-
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhc2FuLCAxLzIp') }}
632-
name: "Stateless tests (asan, 1/2)"
631+
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhc2FuLCBkaXN0cmlidXRlZCBwbGFuLCAxLzIp') }}
632+
name: "Stateless tests (asan, distributed plan, 1/2)"
633633
outputs:
634634
data: ${{ steps.run.outputs.DATA }}
635635
steps:
@@ -658,16 +658,16 @@ jobs:
658658
. ./ci/tmp/praktika_setup_env.sh
659659
set -o pipefail
660660
if command -v ts &> /dev/null; then
661-
python3 -m praktika run 'Stateless tests (asan, 1/2)' --workflow "BackportPR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
661+
python3 -m praktika run 'Stateless tests (asan, distributed plan, 1/2)' --workflow "BackportPR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
662662
else
663-
python3 -m praktika run 'Stateless tests (asan, 1/2)' --workflow "BackportPR" --ci |& tee ./ci/tmp/job.log
663+
python3 -m praktika run 'Stateless tests (asan, distributed plan, 1/2)' --workflow "BackportPR" --ci |& tee ./ci/tmp/job.log
664664
fi
665665
666-
stateless_tests_asan_2_2:
666+
stateless_tests_asan_distributed_plan_2_2:
667667
runs-on: [self-hosted, func-tester]
668668
needs: [config_workflow, dockers_build_amd_and_merge, build_amd_asan]
669-
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhc2FuLCAyLzIp') }}
670-
name: "Stateless tests (asan, 2/2)"
669+
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhc2FuLCBkaXN0cmlidXRlZCBwbGFuLCAyLzIp') }}
670+
name: "Stateless tests (asan, distributed plan, 2/2)"
671671
outputs:
672672
data: ${{ steps.run.outputs.DATA }}
673673
steps:
@@ -696,9 +696,9 @@ jobs:
696696
. ./ci/tmp/praktika_setup_env.sh
697697
set -o pipefail
698698
if command -v ts &> /dev/null; then
699-
python3 -m praktika run 'Stateless tests (asan, 2/2)' --workflow "BackportPR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
699+
python3 -m praktika run 'Stateless tests (asan, distributed plan, 2/2)' --workflow "BackportPR" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
700700
else
701-
python3 -m praktika run 'Stateless tests (asan, 2/2)' --workflow "BackportPR" --ci |& tee ./ci/tmp/job.log
701+
python3 -m praktika run 'Stateless tests (asan, distributed plan, 2/2)' --workflow "BackportPR" --ci |& tee ./ci/tmp/job.log
702702
fi
703703
704704
stress_test_amd_tsan:

.github/workflows/create_release.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,16 +128,17 @@ jobs:
128128
run: |
129129
python3 ./tests/ci/create_release.py --set-progress-started --progress "update changelog, docker version, security"
130130
131-
git checkout master # in case WF started from feature branch
131+
# git checkout master # in case WF started from feature branch
132132
echo "List versions"
133133
./utils/list-versions/list-versions.sh > ./utils/list-versions/version_date.tsv
134134
echo "Update docker version"
135135
./utils/list-versions/update-docker-version.sh
136136
echo "Generate ChangeLog"
137137
export CI=1
138+
docker pull clickhouse/style-test:latest
138139
docker run -u "${UID}:${GID}" -e PYTHONUNBUFFERED=1 -e CI=1 --network=host \
139140
--volume=".:/wd" --workdir="/wd" \
140-
clickhouse/style-test \
141+
clickhouse/style-test:latest \
141142
./tests/ci/changelog.py -v --debug-helpers \
142143
--gh-user-or-token ${{ secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN }} \
143144
--jobs=5 \
@@ -148,7 +149,7 @@ jobs:
148149
git diff HEAD
149150
- name: Create ChangeLog PR
150151
if: ${{ inputs.type == 'patch' && ! inputs.dry-run && ! inputs.only-repo && ! inputs.only-docker }}
151-
uses: peter-evans/create-pull-request@v6
152+
uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # v6
152153
with:
153154
author: "robot-clickhouse <[email protected]>"
154155
token: ${{ secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN }}

0 commit comments

Comments
 (0)