Skip to content

Commit b1a24ab

Browse files
authored
Merge branch 'master' into branch-variant-escape-dots
2 parents cb6cf60 + 9e598d3 commit b1a24ab

211 files changed

Lines changed: 12032 additions & 959 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.

‎.asf.yaml‎

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ github:
4242
merge: false
4343
rebase: false
4444
protected_branches:
45+
# master, branch-4.2 and branch-4.1 use the migrated TeamCity contexts.
46+
# External and Performance report results without gating these branches.
4547
master:
4648
required_status_checks:
4749
strict: false
@@ -50,20 +52,18 @@ github:
5052
- Check for secrets
5153
- Clang Formatter
5254
- CheckStyle
53-
- P0 Regression (Doris Regression)
54-
- NonConcurrent Regression (nonConcurrent)
55-
- External Regression (Doris External Regression)
56-
- cloud_p0 (Doris Cloud Regression)
57-
- vault_p0 (Doris Cloud Regression)
58-
- FE UT (Doris FE UT)
59-
- BE UT (Doris BE UT)
55+
- TeamCity/p0
56+
- TeamCity/nonconcurrent
57+
- TeamCity/cloud_p0
58+
- TeamCity/vault_p0
59+
- TeamCity/feut
60+
- TeamCity/beut
6061
- Build Third Party Libraries (Linux)
6162
- Build Third Party Libraries (macOS)
6263
- Build Third Party Libraries (macOS-arm64)
63-
- COMPILE (DORIS_COMPILE)
64+
- TeamCity/compile
6465
- code-review
65-
- Cloud UT (Doris Cloud UT)
66-
- performance (Doris Performance)
66+
- TeamCity/cloudut
6767
required_pull_request_reviews:
6868
dismiss_stale_reviews: true
6969
require_code_owner_reviews: true
@@ -76,15 +76,14 @@ github:
7676
- Clang Formatter
7777
- CheckStyle
7878
- Build Broker
79-
- FE UT (Doris FE UT)
80-
- BE UT (Doris BE UT)
81-
- Cloud UT (Doris Cloud UT)
82-
- COMPILE (DORIS_COMPILE)
83-
- P0 Regression (Doris Regression)
84-
- NonConcurrent Regression (nonConcurrent)
85-
- External Regression (Doris External Regression)
86-
- cloud_p0 (Doris Cloud Regression)
87-
- vault_p0 (Doris Cloud Regression)
79+
- TeamCity/feut
80+
- TeamCity/beut
81+
- TeamCity/cloudut
82+
- TeamCity/compile
83+
- TeamCity/p0
84+
- TeamCity/nonconcurrent
85+
- TeamCity/cloud_p0
86+
- TeamCity/vault_p0
8887
required_pull_request_reviews:
8988
require_code_owner_reviews: true
9089
required_approving_review_count: 1
@@ -97,15 +96,14 @@ github:
9796
- Clang Formatter
9897
- CheckStyle
9998
- Build Broker
100-
- FE UT (Doris FE UT)
101-
- BE UT (Doris BE UT)
102-
- Cloud UT (Doris Cloud UT)
103-
- COMPILE (DORIS_COMPILE)
104-
- P0 Regression (Doris Regression)
105-
- NonConcurrent Regression (nonConcurrent)
106-
- External Regression (Doris External Regression)
107-
- cloud_p0 (Doris Cloud Regression)
108-
- vault_p0 (Doris Cloud Regression)
99+
- TeamCity/feut
100+
- TeamCity/beut
101+
- TeamCity/cloudut
102+
- TeamCity/compile
103+
- TeamCity/p0
104+
- TeamCity/nonconcurrent
105+
- TeamCity/cloud_p0
106+
- TeamCity/vault_p0
109107
required_pull_request_reviews:
110108
require_code_owner_reviews: true
111109
required_approving_review_count: 1

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ be/src/exprs/vsearch.cpp @airborne12 @eldenmoon @csun5285
3232
be/src/cloud @liaoxin01 @luwei16 @gavinchou
3333
be/src/common @yiguolei @Mryange
3434
be/src/core @yiguolei @Mryange
35+
be/src/exec/spill @yiguolei @mrhhsg @HappenLee
3536
be/src/io @liaoxin01 @gavinchou @morningman @Gabriel39
3637
be/src/io/cache @liaoxin01 @gavinchou @morningman @Gabriel39
3738
be/src/io/fs @liaoxin01 @gavinchou @morningman @Gabriel39

‎.github/workflows/code-review-runner.yml‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ jobs:
4444
if: ${{ github.event_name == 'workflow_dispatch' && inputs.runtime_canary == true }}
4545
runs-on: ubuntu-24.04
4646
timeout-minutes: 25
47+
env:
48+
CANARY_AUTH_OBJECT: oss://doris-community-ci/codex/auth.json.1
4749
permissions:
4850
contents: read
4951
steps:
@@ -87,7 +89,7 @@ jobs:
8789
home="$RUNNER_TEMP/codex-canary-home"
8890
install -m 700 -d "$home"
8991
ossutil -i "$OSS_AK" -k "$OSS_SK" -e "$OSS_ENDPOINT" \
90-
cp -f oss://doris-community-ci/codex/auth.json.4 "$home/auth.json" >/dev/null
92+
cp -f "$CANARY_AUTH_OBJECT" "$home/auth.json" >/dev/null
9193
jq -e '
9294
.auth_mode == "chatgpt"
9395
and (.tokens.access_token | type == "string" and length > 0)
@@ -174,7 +176,6 @@ jobs:
174176
OSS_ENDPOINT: oss-cn-hongkong.aliyuncs.com
175177
run: |
176178
set -euo pipefail
177-
auth_object=oss://doris-community-ci/codex/auth.json.4
178179
jq -e '
179180
.auth_mode == "chatgpt"
180181
and (.tokens.access_token | type == "string" and length > 0)
@@ -189,14 +190,14 @@ jobs:
189190
remote_auth="$(mktemp "$RUNNER_TEMP/codex-canary-current.XXXXXX")"
190191
trap 'rm -f "$remote_auth"' EXIT
191192
ossutil -i "$OSS_AK" -k "$OSS_SK" -e "$OSS_ENDPOINT" \
192-
cp -f "$auth_object" "$remote_auth" >/dev/null
193+
cp -f "$CANARY_AUTH_OBJECT" "$remote_auth" >/dev/null
193194
remote_hash="$(sha256sum "$remote_auth" | awk '{print $1}')"
194195
if [ "$remote_hash" != "$original_hash" ]; then
195196
echo "::error::Auth changed concurrently; refusing to overwrite it."
196197
exit 1
197198
fi
198199
ossutil -i "$OSS_AK" -k "$OSS_SK" -e "$OSS_ENDPOINT" \
199-
cp -f "$CODEX_HOME/auth.json" "$auth_object" >/dev/null
200+
cp -f "$CODEX_HOME/auth.json" "$CANARY_AUTH_OBJECT" >/dev/null
200201
echo "Synced refreshed canary auth."
201202
202203
code-review:
@@ -347,12 +348,6 @@ jobs:
347348
ref: ${{ steps.review_inputs.outputs.head_sha }}
348349
fetch-depth: 0
349350

350-
- name: Install ripgrep
351-
timeout-minutes: 5
352-
run: |
353-
sudo apt-get update
354-
sudo apt-get install -y ripgrep
355-
356351
- name: Install ossutil
357352
timeout-minutes: 5
358353
run: |
@@ -376,6 +371,7 @@ jobs:
376371
(cd "$package" && sha256sum --check SHA256SUMS)
377372
test "$(jq -r .version "$package/codex-package.json")" = 0.166.0
378373
echo "$package/bin" >> "$GITHUB_PATH"
374+
echo "$package/codex-path" >> "$GITHUB_PATH"
379375
env:
380376
OSS_AK: ${{ secrets.OSS_AK }}
381377
OSS_SK: ${{ secrets.OSS_SK }}
@@ -386,6 +382,8 @@ jobs:
386382
timeout-minutes: 2
387383
run: |
388384
set -euo pipefail
385+
test "$(command -v rg)" = "$RUNNER_TEMP/codex-exec-goal/codex-path/rg"
386+
rg --version
389387
codex_cmd="$(command -v codex)"
390388
test "$(readlink -f "$codex_cmd")" = "$RUNNER_TEMP/codex-exec-goal/bin/codex"
391389
echo "9346ee98398cb7240702e45eed4cbe38c7fb990d9e031dba4e7525383c415deb $codex_cmd" | sha256sum --check

0 commit comments

Comments
 (0)