Skip to content

Commit 617033f

Browse files
azatazat
committed
Merge remote-tracking branch 'u/master' into mt/rename-without-lock-v2
2 parents 346823b + 1f5082e commit 617033f

File tree

1,558 files changed

+46273
-13421
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,558 files changed

+46273
-13421
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ At a minimum, the following information should be added (but add more as needed)
5959
- [ ] <!---ci_exclude_tsan|msan|ubsan|coverage--> Exclude: All with TSAN, MSAN, UBSAN, Coverage
6060
- [ ] <!---ci_exclude_aarch64|release|debug--> Exclude: All with aarch64, release, debug
6161
---
62+
- [ ] <!---ci_include_fuzzer--> Run only fuzzers related jobs (libFuzzer fuzzers, AST fuzzers, etc.)
63+
- [ ] <!---ci_exclude_ast--> Exclude: AST fuzzers
64+
---
6265
- [ ] <!---do_not_test--> Do not test
6366
- [ ] <!---woolen_wolfdog--> Woolen Wolfdog
6467
- [ ] <!---upload_all--> Upload binaries for special builds

‎.github/actions/clean/action.yml‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,23 @@
11
name: Clean runner
22
description: Clean the runner's temp path on ending
3+
inputs:
4+
images:
5+
description: clean docker images
6+
default: false
7+
type: boolean
38
runs:
49
using: "composite"
510
steps:
6-
- name: Clean
11+
- name: Clean Temp
712
shell: bash
813
run: |
9-
docker ps --quiet | xargs --no-run-if-empty docker kill ||:
10-
docker ps --all --quiet | xargs --no-run-if-empty docker rm -f ||:
11-
sudo rm -fr "${{runner.temp}}"
14+
sudo rm -fr "${{runner.temp}}"
15+
- name: Clean Docker Containers
16+
shell: bash
17+
run: |
18+
docker rm -vf $(docker ps -aq) ||:
19+
- name: Clean Docker Images
20+
if: ${{ inputs.images }}
21+
shell: bash
22+
run: |
23+
docker rmi -f $(docker images -aq) ||:

‎.github/actions/debug/action.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
name: DebugInfo
2+
description: Prints workflow debug info
3+
4+
runs:
5+
using: "composite"
6+
steps:
7+
- name: Print envs
8+
shell: bash
9+
run: |
10+
echo "::group::Envs"
11+
env
12+
echo "::endgroup::"
13+
- name: Print Event.json
14+
shell: bash
15+
run: |
16+
echo "::group::Event.json"
17+
python3 -m json.tool "$GITHUB_EVENT_PATH"
18+
echo "::endgroup::"

‎.github/workflows/auto_releases.yml‎

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
name: AutoReleases
2+
3+
env:
4+
PYTHONUNBUFFERED: 1
5+
6+
concurrency:
7+
group: autoreleases
8+
9+
on:
10+
# schedule:
11+
# - cron: '0 9 * * *'
12+
workflow_dispatch:
13+
inputs:
14+
dry-run:
15+
description: 'Dry run'
16+
required: false
17+
default: false
18+
type: boolean
19+
20+
jobs:
21+
AutoReleaseInfo:
22+
runs-on: [self-hosted, release-maker]
23+
outputs:
24+
data: ${{ steps.info.outputs.AUTO_RELEASE_PARAMS }}
25+
dry_run: ${{ steps.info.outputs.DRY_RUN }}
26+
steps:
27+
- name: Set envs
28+
run: |
29+
cat >> "$GITHUB_ENV" << 'EOF'
30+
ROBOT_CLICKHOUSE_SSH_KEY<<RCSK
31+
${{secrets.ROBOT_CLICKHOUSE_SSH_KEY}}
32+
RCSK
33+
EOF
34+
echo "DRY_RUN=true" >> "$GITHUB_ENV"
35+
- name: Check out repository code
36+
uses: ClickHouse/checkout@v1
37+
with:
38+
fetch-depth: 0 # full history needed
39+
- name: Debug Info
40+
uses: ./.github/actions/debug
41+
- name: Prepare Info
42+
id: info
43+
run: |
44+
cd "$GITHUB_WORKSPACE/tests/ci"
45+
python3 auto_release.py --prepare
46+
echo "::group::Auto Release Info"
47+
python3 -m json.tool /tmp/autorelease_info.json
48+
echo "::endgroup::"
49+
{
50+
echo 'AUTO_RELEASE_PARAMS<<EOF'
51+
cat /tmp/autorelease_params.json
52+
echo 'EOF'
53+
} >> "$GITHUB_OUTPUT"
54+
if [[ "${{ github.event_name }}" == "schedule" ]]; then
55+
echo "DRY_RUN=true" >> "$GITHUB_OUTPUT"
56+
else
57+
echo "DRY_RUN=${{ github.event.inputs.dry-run }}" >> "$GITHUB_OUTPUT"
58+
fi
59+
- name: Post Release Branch statuses
60+
run: |
61+
cd "$GITHUB_WORKSPACE/tests/ci"
62+
python3 auto_release.py --post-status
63+
- name: Clean up
64+
uses: ./.github/actions/clean
65+
66+
Releases:
67+
needs: AutoReleaseInfo
68+
strategy:
69+
matrix:
70+
release_params: ${{ fromJson(needs.AutoReleaseInfo.outputs.data).releases }}
71+
max-parallel: 1
72+
name: Release ${{ matrix.release_params.release_branch }}
73+
uses: ./.github/workflows/create_release.yml
74+
with:
75+
ref: ${{ matrix.release_params.commit_sha }}
76+
type: patch
77+
dry-run: ${{ fromJson(needs.AutoReleaseInfo.outputs.dry_run) }}
78+
secrets:
79+
ROBOT_CLICKHOUSE_COMMIT_TOKEN: ${{ secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN }}
80+
81+
CleanUp:
82+
needs: [Releases]
83+
runs-on: [self-hosted, release-maker]
84+
steps:
85+
- uses: ./.github/actions/clean
86+
with:
87+
images: true
88+
89+
# PostSlackMessage:
90+
# needs: [Releases]
91+
# runs-on: [self-hosted, release-maker]
92+
# if: ${{ !cancelled() }}
93+
# steps:
94+
# - name: Check out repository code
95+
# uses: ClickHouse/checkout@v1
96+
# - name: Post
97+
# run: |
98+
# cd "$GITHUB_WORKSPACE/tests/ci"
99+
# python3 auto_release.py --post-auto-release-complete --wf-status ${{ job.status }}

‎.github/workflows/create_release.yml‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: CreateRelease
22

33
concurrency:
44
group: release
5+
56
'on':
67
workflow_dispatch:
78
inputs:
@@ -26,6 +27,28 @@ concurrency:
2627
required: false
2728
default: false
2829
type: boolean
30+
workflow_call:
31+
inputs:
32+
ref:
33+
description: 'Git reference (branch or commit sha) from which to create the release'
34+
required: true
35+
type: string
36+
type:
37+
description: 'The type of release: "new" for a new release or "patch" for a patch release'
38+
required: true
39+
type: string
40+
only-repo:
41+
description: 'Run only repos updates including docker (repo-recovery, tests)'
42+
required: false
43+
default: false
44+
type: boolean
45+
dry-run:
46+
description: 'Dry run'
47+
required: false
48+
default: false
49+
type: boolean
50+
secrets:
51+
ROBOT_CLICKHOUSE_COMMIT_TOKEN:
2952

3053
jobs:
3154
CreateRelease:
@@ -101,6 +124,7 @@ jobs:
101124
--volume=".:/wd" --workdir="/wd" \
102125
clickhouse/style-test \
103126
./tests/ci/changelog.py -v --debug-helpers \
127+
--gh-user-or-token ${{ secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN }} \
104128
--jobs=5 \
105129
--output="./docs/changelogs/${{ env.RELEASE_TAG }}.md" ${{ env.RELEASE_TAG }}
106130
git add ./docs/changelogs/${{ env.RELEASE_TAG }}.md
@@ -129,9 +153,9 @@ jobs:
129153
if: ${{ inputs.type == 'patch' && ! inputs.only-repo }}
130154
shell: bash
131155
run: |
132-
python3 ./tests/ci/create_release.py --set-progress-completed
133156
git reset --hard HEAD
134157
git checkout "$GITHUB_REF_NAME"
158+
python3 ./tests/ci/create_release.py --set-progress-completed
135159
- name: Create GH Release
136160
if: ${{ inputs.type == 'patch' && ! inputs.only-repo }}
137161
shell: bash

‎.github/workflows/release_branches.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ jobs:
130130
with:
131131
build_name: package_debug
132132
data: ${{ needs.RunConfig.outputs.data }}
133+
force: true
133134
BuilderBinDarwin:
134135
needs: [RunConfig, BuildDockers]
135136
if: ${{ !failure() && !cancelled() }}
@@ -482,13 +483,12 @@ jobs:
482483
if: ${{ !failure() }}
483484
run: |
484485
# update overall ci report
485-
python3 finish_check.py --wf-status ${{ contains(needs.*.result, 'failure') && 'failure' || 'success' }}
486+
python3 ./tests/ci/finish_check.py --wf-status ${{ contains(needs.*.result, 'failure') && 'failure' || 'success' }}
486487
- name: Check Workflow results
487488
if: ${{ !cancelled() }}
488489
run: |
489490
export WORKFLOW_RESULT_FILE="/tmp/workflow_results.json"
490491
cat > "$WORKFLOW_RESULT_FILE" << 'EOF'
491492
${{ toJson(needs) }}
492493
EOF
493-
494494
python3 ./tests/ci/ci_buddy.py --check-wf-status

‎.gitmodules‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
url = https://github.com/ClickHouse/icudata
109109
[submodule "contrib/icu"]
110110
path = contrib/icu
111-
url = https://github.com/unicode-org/icu
111+
url = https://github.com/ClickHouse/icu
112112
[submodule "contrib/flatbuffers"]
113113
path = contrib/flatbuffers
114114
url = https://github.com/ClickHouse/flatbuffers
@@ -230,9 +230,6 @@
230230
[submodule "contrib/minizip-ng"]
231231
path = contrib/minizip-ng
232232
url = https://github.com/zlib-ng/minizip-ng
233-
[submodule "contrib/annoy"]
234-
path = contrib/annoy
235-
url = https://github.com/ClickHouse/annoy
236233
[submodule "contrib/qpl"]
237234
path = contrib/qpl
238235
url = https://github.com/intel/qpl
@@ -348,9 +345,6 @@
348345
[submodule "contrib/FP16"]
349346
path = contrib/FP16
350347
url = https://github.com/Maratyszcza/FP16.git
351-
[submodule "contrib/robin-map"]
352-
path = contrib/robin-map
353-
url = https://github.com/Tessil/robin-map.git
354348
[submodule "contrib/aklomp-base64"]
355349
path = contrib/aklomp-base64
356350
url = https://github.com/aklomp/base64.git

0 commit comments

Comments
 (0)