Skip to content

Commit 3d40f70

Browse files
alesapinalesapin
authored
Merge branch 'master' into tests/capture-kill-output
2 parents a66db7a + bb22736 commit 3d40f70

File tree

643 files changed

+9238
-3146
lines changed

Some content is hidden

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

643 files changed

+9238
-3146
lines changed

‎.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/workflows/auto_releases.yml‎

Lines changed: 40 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,16 @@ on:
1414
dry-run:
1515
description: 'Dry run'
1616
required: false
17-
default: true
17+
default: false
1818
type: boolean
1919

2020
jobs:
2121
AutoReleaseInfo:
22-
runs-on: [self-hosted, style-checker-aarch64]
22+
runs-on: [self-hosted, release-maker]
2323
outputs:
2424
data: ${{ steps.info.outputs.AUTO_RELEASE_PARAMS }}
2525
dry_run: ${{ steps.info.outputs.DRY_RUN }}
2626
steps:
27-
- name: Debug Info
28-
uses: ./.github/actions/debug
2927
- name: Set envs
3028
run: |
3129
cat >> "$GITHUB_ENV" << 'EOF'
@@ -36,6 +34,10 @@ jobs:
3634
echo "DRY_RUN=true" >> "$GITHUB_ENV"
3735
- name: Check out repository code
3836
uses: ClickHouse/checkout@v1
37+
with:
38+
fetch-depth: 0 # full history needed
39+
- name: Debug Info
40+
uses: ./.github/actions/debug
3941
- name: Prepare Info
4042
id: info
4143
run: |
@@ -46,64 +48,52 @@ jobs:
4648
echo "::endgroup::"
4749
{
4850
echo 'AUTO_RELEASE_PARAMS<<EOF'
49-
cat /tmp/autorelease_info.json
50-
echo 'EOF'
51-
} >> "$GITHUB_ENV"
52-
{
53-
echo 'AUTO_RELEASE_PARAMS<<EOF'
54-
cat /tmp/autorelease_info.json
51+
cat /tmp/autorelease_params.json
5552
echo 'EOF'
5653
} >> "$GITHUB_OUTPUT"
57-
echo "DRY_RUN=true" >> "$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
5859
- name: Post Release Branch statuses
5960
run: |
6061
cd "$GITHUB_WORKSPACE/tests/ci"
6162
python3 auto_release.py --post-status
6263
- name: Clean up
6364
uses: ./.github/actions/clean
6465

65-
Release_0:
66+
Releases:
6667
needs: AutoReleaseInfo
67-
name: Release ${{ fromJson(needs.AutoReleaseInfo.outputs.data).releases[0].release_branch }}
68-
if: ${{ fromJson(needs.AutoReleaseInfo.outputs.data).releases[0] && fromJson(needs.AutoReleaseInfo.outputs.data).releases[0].ready }}
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 }}
6973
uses: ./.github/workflows/create_release.yml
7074
with:
71-
ref: ${{ fromJson(needs.AutoReleaseInfo.outputs.data).releases[0].commit_sha }}
75+
ref: ${{ matrix.release_params.commit_sha }}
7276
type: patch
73-
dry-run: ${{ needs.AutoReleaseInfo.outputs.dry_run }}
74-
#
75-
# Release_1:
76-
# needs: [AutoReleaseInfo, Release_0]
77-
# name: Release ${{ fromJson(needs.AutoReleaseInfo.outputs.data).releases[1].release_branch }}
78-
# if: ${{ fromJson(needs.AutoReleaseInfo.outputs.data).releases[1] && fromJson(needs.AutoReleaseInfo.outputs.data).releases[1].ready }}
79-
# uses: ./.github/workflows/create_release.yml
80-
# with:
81-
# ref: ${{ fromJson(needs.AutoReleaseInfo.outputs.data).releases[1].commit_sha }}
82-
# type: patch
83-
# dry-run: ${{ env.DRY_RUN }}
84-
#
85-
# Release_2:
86-
# needs: [AutoReleaseInfo, Release_1]
87-
# name: Release ${{ fromJson(needs.AutoReleaseInfo.outputs.data).releases[2].release_branch }}
88-
# if: ${{ fromJson(needs.AutoReleaseInfo.outputs.data).releases[0] && fromJson(needs.AutoReleaseInfo.outputs.data).releases[2].ready }}
89-
# uses: ./.github/workflow/create_release.yml
90-
# with:
91-
# ref: ${{ fromJson(needs.AutoReleaseInfo.outputs.data).releases[0].commit_sha }}
92-
# type: patch
93-
# dry-run: ${{ env.DRY_RUN }}
94-
#
95-
# Release_3:
96-
# needs: [AutoReleaseInfo, Release_2]
97-
# name: Release ${{ fromJson(needs.AutoReleaseInfo.outputs.data).releases[3].release_branch }}
98-
# if: ${{ fromJson(needs.AutoReleaseInfo.outputs.data).releases[3] && fromJson(needs.AutoReleaseInfo.outputs.data).releases[3].ready }}
99-
# uses: ./.github/workflow/create_release.yml
100-
# with:
101-
# ref: ${{ fromJson(needs.AutoReleaseInfo.outputs.data).releases[3].commit_sha }}
102-
# type: patch
103-
# dry-run: ${{ env.DRY_RUN }}
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
10488

105-
# - name: Post Slack Message
89+
# PostSlackMessage:
90+
# needs: [Releases]
91+
# runs-on: [self-hosted, release-maker]
10692
# if: ${{ !cancelled() }}
107-
# run: |
108-
# cd "$GITHUB_WORKSPACE/tests/ci"
109-
# python3 auto_release.py --post-auto-release-complete --wf-status ${{ job.status }}
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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ concurrency:
4747
required: false
4848
default: false
4949
type: boolean
50+
secrets:
51+
ROBOT_CLICKHOUSE_COMMIT_TOKEN:
5052

5153
jobs:
5254
CreateRelease:

‎.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 & 1 deletion
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

0 commit comments

Comments
 (0)