Skip to content

Commit c9d903d

Browse files
arthurpassosarthurpassos
authored
Merge branch 'antalya-25.8' into export_replicated_mt_partition_v2
2 parents 88cfc70 + d6d27ce commit c9d903d

407 files changed

Lines changed: 10309 additions & 2266 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.

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,38 @@ tests/ci/cancel_and_rerun_workflow_lambda/app.py
1818
- Not for changelog (changelog entry is not required)
1919

2020

21-
### Changelog entry (a [user-readable short description](https://github.com/ClickHouse/ClickHouse/blob/master/docs/changelog_entry_guidelines.md) of the changes that goes into CHANGELOG.md):
21+
### Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
2222
...
2323

2424
### Documentation entry for user-facing changes
2525
...
2626

27+
### CI/CD Options
2728
#### Exclude tests:
2829
- [ ] <!---ci_exclude_fast--> Fast test
2930
- [ ] <!---ci_exclude_integration--> Integration Tests
3031
- [ ] <!---ci_exclude_stateless--> Stateless tests
3132
- [ ] <!---ci_exclude_stateful--> Stateful tests
3233
- [ ] <!---ci_exclude_performance--> Performance tests
33-
- [ ] <!---ci_exclude_asan--> All with ASAN
34-
- [ ] <!---ci_exclude_tsan--> All with TSAN
35-
- [ ] <!---ci_exclude_msan--> All with MSAN
36-
- [ ] <!---ci_exclude_ubsan--> All with UBSAN
37-
- [ ] <!---ci_exclude_coverage--> All with Coverage
38-
- [ ] <!---ci_exclude_aarch64--> All with Aarch64
39-
- [ ] <!---ci_exclude_regression--> All Regression
34+
- [x] <!---ci_exclude_asan--> All with ASAN
35+
- [x] <!---ci_exclude_tsan--> All with TSAN
36+
- [x] <!---ci_exclude_msan--> All with MSAN
37+
- [x] <!---ci_exclude_ubsan--> All with UBSAN
38+
- [x] <!---ci_exclude_coverage--> All with Coverage
39+
- [ ] <!---ci_exclude_aarch64|arm--> All with Aarch64
40+
- [x] <!---ci_exclude_regression--> All Regression
4041
- [ ] <!---no_ci_cache--> Disable CI Cache
42+
43+
#### Regression jobs to run:
44+
- [ ] <!---ci_regression_common--> Fast suites (mostly <1h)
45+
- [ ] <!---ci_regression_aggregate_functions--> Aggregate Functions (2h)
46+
- [ ] <!---ci_regression_alter--> Alter (1.5h)
47+
- [ ] <!---ci_regression_benchmark--> Benchmark (30m)
48+
- [ ] <!---ci_regression_clickhouse_keeper--> ClickHouse Keeper (1h)
49+
- [ ] <!---ci_regression_iceberg--> Iceberg (2h)
50+
- [ ] <!---ci_regression_ldap--> LDAP (1h)
51+
- [ ] <!---ci_regression_parquet--> Parquet (1.5h)
52+
- [ ] <!---ci_regression_rbac--> RBAC (1.5h)
53+
- [ ] <!---ci_regression_ssl_server--> SSL Server (1h)
54+
- [ ] <!---ci_regression_s3--> S3 (2h)
55+
- [ ] <!---ci_regression_tiered_storage--> Tiered Storage (2h)

‎.github/dco.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# The configuration file must be named `dco.yml` and placed in the `.github` directory in the default branch of the repository.
2+
#
3+
# This configuration file is backwards compatible with the *dcoapp/app* (https://github.com/dcoapp/app) configuration file.
4+
5+
# https://github.com/cncf/dco2?#remediation-commits
6+
allowRemediationCommits:
7+
# Allow individual remediation commits
8+
# https://github.com/cncf/dco2?#individual
9+
individual: true
10+
# Allow third-party remediation commits
11+
# https://github.com/cncf/dco2?#third-party
12+
thirdParty: false
13+
14+
require:
15+
# Members are required to sign-off commits
16+
# https://github.com/cncf/dco2?#skipping-sign-off-for-organization-members
17+
members: false

‎.github/workflows/README.md‎

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

‎.github/workflows/backport_branches.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ on:
1616
env:
1717
# Force the stdout and stderr streams to be unbuffered
1818
PYTHONUNBUFFERED: 1
19+
GH_TOKEN: ${{ github.token }}
1920
DISABLE_CI_MERGE_COMMIT: ${{ vars.DISABLE_CI_MERGE_COMMIT || '0' }}
2021
DISABLE_CI_CACHE: ${{ github.event.inputs.no_cache || '0' }}
2122
CHECKOUT_REF: ${{ vars.DISABLE_CI_MERGE_COMMIT == '1' && github.event.pull_request.head.sha || '' }}
@@ -27,15 +28,14 @@ env:
2728
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
2829
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
2930
CHECKS_DATABASE_HOST: ${{ secrets.CHECKS_DATABASE_HOST }}
31+
CLICKHOUSE_PLAY_DB: gh-data
3032
AZURE_STORAGE_KEY: ${{ secrets.AZURE_STORAGE_KEY }}
3133
AZURE_ACCOUNT_NAME: ${{ secrets.AZURE_ACCOUNT_NAME }}
3234
AZURE_CONTAINER_NAME: ${{ secrets.AZURE_CONTAINER_NAME }}
3335
AZURE_STORAGE_ACCOUNT_URL: "https://${{ secrets.AZURE_ACCOUNT_NAME }}.blob.core.windows.net/"
3436
ROBOT_TOKEN: ${{ secrets.ROBOT_TOKEN }}
35-
GH_TOKEN: ${{ github.token }}
3637

37-
# Allow updating GH commit statuses and PR comments to post an actual job reports link
38-
permissions: write-all
38+
3939

4040
jobs:
4141

@@ -59,6 +59,7 @@ jobs:
5959
test_name: "Config Workflow"
6060

6161
- name: Note report location to summary
62+
if: ${{ !failure() && env.AWS_ACCESS_KEY_ID && env.AWS_SECRET_ACCESS_KEY }}
6263
env:
6364
PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
6465
COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}

‎.github/workflows/cancel.yml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,14 @@ env:
66

77
on: # yamllint disable-line rule:truthy
88
workflow_run:
9-
workflows: ["PR","PullRequestCI", "ReleaseBranchCI", "DocsCheck", "BackportPR"]
9+
workflows:
10+
- "PR"
11+
- "Community PR"
12+
- "PullRequestCI"
13+
- "ReleaseBranchCI"
14+
- "MasterCI"
15+
- "DocsCheck"
16+
- "BackportPR"
1017
types:
1118
- requested
1219
jobs:

‎.github/workflows/compare_fails.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,15 @@ jobs:
7474
run: |
7575
VERSION=$(git describe --tags --abbrev=0 | sed 's/v\([0-9]\+\.[0-9]\+\).*/\1/')
7676
echo "Detected version: $VERSION"
77-
78-
CURRENT_TAG=$(git tag --contains ${{ inputs.current_ref || github.sha }} | sort -r | grep -m 1 'altinity' || echo '')
79-
echo "CURRENT_TAG: '$CURRENT_TAG' ${{ inputs.current_ref || github.sha }}"
77+
78+
CURRENT_TAG=$(git tag --contains ${{ inputs.current_ref || github.sha }} | sort -r | grep -m 1 'altinity')
79+
echo "CURRENT_TAG: $CURRENT_TAG ${{ inputs.current_ref || github.sha }}"
8080
PREVIOUS_TAG_COMMIT=$(git log -1 --until=yesterday --tags=v${VERSION}*.altinity* | grep -Po "(?<=commit ).*")
8181
PREVIOUS_TAG=$(git tag --contains $PREVIOUS_TAG_COMMIT | sort -r | grep -m 1 'altinity')
82-
echo "PREVIOUS_TAG: '$PREVIOUS_TAG' $PREVIOUS_TAG_COMMIT"
82+
echo "PREVIOUS_TAG: $PREVIOUS_TAG $PREVIOUS_TAG_COMMIT"
8383
UPSTREAM_TAG_COMMIT=$(git log -1 --tags=v${VERSION}*-lts | grep -Po "(?<=commit ).*")
8484
UPSTREAM_TAG=$(git tag --contains $UPSTREAM_TAG_COMMIT | sort -r | grep -m 1 'lts')
85-
echo "UPSTREAM_TAG: '$UPSTREAM_TAG' $UPSTREAM_TAG_COMMIT"
85+
echo "UPSTREAM_TAG: $UPSTREAM_TAG $UPSTREAM_TAG_COMMIT"
8686
8787
echo "PREVIOUS_TAG=$PREVIOUS_TAG" >> $GITHUB_OUTPUT
8888
echo "PREVIOUS_TAG_COMMIT=$PREVIOUS_TAG_COMMIT" >> $GITHUB_OUTPUT

‎.github/workflows/grype_scan.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ jobs:
146146
147147
- name: Upload artifacts
148148
if: always()
149-
uses: actions/upload-artifact@v4
149+
uses: actions/upload-artifact@v6
150150
with:
151151
name: grype-results-${{ hashFiles('raw.log') }}
152152
path: |

‎.github/workflows/master.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ on:
1616
env:
1717
# Force the stdout and stderr streams to be unbuffered
1818
PYTHONUNBUFFERED: 1
19+
GH_TOKEN: ${{ github.token }}
1920
DISABLE_CI_CACHE: ${{ github.event.inputs.no_cache || '0' }}
2021
CHECKOUT_REF: ""
2122
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
@@ -26,15 +27,14 @@ env:
2627
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
2728
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
2829
CHECKS_DATABASE_HOST: ${{ secrets.CHECKS_DATABASE_HOST }}
30+
CLICKHOUSE_PLAY_DB: gh-data
2931
AZURE_STORAGE_KEY: ${{ secrets.AZURE_STORAGE_KEY }}
3032
AZURE_ACCOUNT_NAME: ${{ secrets.AZURE_ACCOUNT_NAME }}
3133
AZURE_CONTAINER_NAME: ${{ secrets.AZURE_CONTAINER_NAME }}
3234
AZURE_STORAGE_ACCOUNT_URL: "https://${{ secrets.AZURE_ACCOUNT_NAME }}.blob.core.windows.net/"
3335
ROBOT_TOKEN: ${{ secrets.ROBOT_TOKEN }}
34-
GH_TOKEN: ${{ github.token }}
3536

36-
# Allow updating GH commit statuses and PR comments to post an actual job reports link
37-
permissions: write-all
37+
3838

3939
jobs:
4040

@@ -58,6 +58,7 @@ jobs:
5858
test_name: "Config Workflow"
5959

6060
- name: Note report location to summary
61+
if: ${{ !failure() && env.AWS_ACCESS_KEY_ID && env.AWS_SECRET_ACCESS_KEY }}
6162
env:
6263
PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
6364
COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
@@ -4178,7 +4179,7 @@ jobs:
41784179
secrets: inherit
41794180
with:
41804181
runner_type: altinity-regression-tester
4181-
commit: 481dd0f61ec5b22430bfc4106ac30d9abfcf70b7
4182+
commit: c29da9161a1845fdcdb1d3406ae9d4800da21a84
41824183
arch: x86
41834184
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
41844185
timeout_minutes: 300
@@ -4190,7 +4191,7 @@ jobs:
41904191
secrets: inherit
41914192
with:
41924193
runner_type: altinity-regression-tester-aarch64
4193-
commit: 481dd0f61ec5b22430bfc4106ac30d9abfcf70b7
4194+
commit: c29da9161a1845fdcdb1d3406ae9d4800da21a84
41944195
arch: aarch64
41954196
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
41964197
timeout_minutes: 300

‎.github/workflows/merge_queue.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ on:
88
env:
99
# Force the stdout and stderr streams to be unbuffered
1010
PYTHONUNBUFFERED: 1
11+
GH_TOKEN: ${{ github.token }}
1112
CHECKOUT_REF: ""
1213
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
1314
CLICKHOUSE_TEST_STAT_URL: ${{ secrets.CLICKHOUSE_TEST_STAT_URL }}
@@ -17,12 +18,12 @@ env:
1718
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
1819
AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
1920
CHECKS_DATABASE_HOST: ${{ secrets.CHECKS_DATABASE_HOST }}
21+
CLICKHOUSE_PLAY_DB: gh-data
2022
AZURE_STORAGE_KEY: ${{ secrets.AZURE_STORAGE_KEY }}
2123
AZURE_ACCOUNT_NAME: ${{ secrets.AZURE_ACCOUNT_NAME }}
2224
AZURE_CONTAINER_NAME: ${{ secrets.AZURE_CONTAINER_NAME }}
2325
AZURE_STORAGE_ACCOUNT_URL: "https://${{ secrets.AZURE_ACCOUNT_NAME }}.blob.core.windows.net/"
2426
ROBOT_TOKEN: ${{ secrets.ROBOT_TOKEN }}
25-
GH_TOKEN: ${{ github.token }}
2627

2728

2829
jobs:
@@ -47,6 +48,7 @@ jobs:
4748
test_name: "Config Workflow"
4849

4950
- name: Note report location to summary
51+
if: ${{ !failure() && env.AWS_ACCESS_KEY_ID && env.AWS_SECRET_ACCESS_KEY }}
5052
env:
5153
PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
5254
COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}

‎.github/workflows/nightly_fuzzers.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ concurrency:
1111

1212
env:
1313
PYTHONUNBUFFERED: 1
14+
GH_TOKEN: ${{ github.token }}
1415
CHECKOUT_REF: ""
1516

1617
jobs:
@@ -35,6 +36,7 @@ jobs:
3536
test_name: "Config Workflow"
3637

3738
- name: Note report location to summary
39+
if: ${{ !failure() && env.AWS_ACCESS_KEY_ID && env.AWS_SECRET_ACCESS_KEY }}
3840
env:
3941
PR_NUMBER: ${{ github.event.pull_request.number || 0 }}
4042
COMMIT_SHA: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}

0 commit comments

Comments
 (0)