Skip to content

Commit b535800

Browse files
authored
Merge branch 'main' into bz/playground-connector
2 parents 73d427b + 25a4809 commit b535800

File tree

214 files changed

+4960
-2786
lines changed

Some content is hidden

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

214 files changed

+4960
-2786
lines changed

.github/labeler.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ labels:
2222
title: "^test.*"
2323
- label: "component/doc"
2424
title: "^doc.*"
25+
- label: "type/deprecate"
26+
title: "^deprecate.*"
2527

2628
- label: "user-facing-changes"
2729
negate: true

.github/pr-title-checker-config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"color": "B60205"
55
},
66
"CHECKS": {
7-
"regexp": "^(feat|fix|test|refactor|chore|style|doc|perf|build|ci|revert)(\\(.*\\))?:.*",
7+
"regexp": "^(feat|fix|test|refactor|chore|style|doc|perf|build|ci|revert|deprecate)(\\(.*\\))?:.*",
88
"ignoreLabels" : ["ignore-title"]
99
}
1010
}

Cargo.lock

Lines changed: 8 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
#!/usr/bin/env bash
2+
3+
# Exits as soon as any line fails.
4+
set -euo pipefail
5+
6+
source ci/scripts/common.env.sh
7+
8+
while getopts 'p:' opt; do
9+
case ${opt} in
10+
p )
11+
profile=$OPTARG
12+
;;
13+
\? )
14+
echo "Invalid Option: -$OPTARG" 1>&2
15+
exit 1
16+
;;
17+
: )
18+
echo "Invalid option: $OPTARG requires an argument" 1>&2
19+
;;
20+
esac
21+
done
22+
shift $((OPTIND -1))
23+
24+
echo "--- Download artifacts"
25+
mkdir -p target/debug
26+
buildkite-agent artifact download risingwave-"$profile" target/debug/
27+
buildkite-agent artifact download risedev-dev-"$profile" target/debug/
28+
buildkite-agent artifact download "e2e_test/generated/*" ./
29+
mv target/debug/risingwave-"$profile" target/debug/risingwave
30+
mv target/debug/risedev-dev-"$profile" target/debug/risedev-dev
31+
32+
echo "--- Adjust permission"
33+
chmod +x ./target/debug/risingwave
34+
chmod +x ./target/debug/risedev-dev
35+
36+
echo "--- Generate RiseDev CI config"
37+
cp ci/risedev-components.ci.env risedev-components.user.env
38+
39+
echo "--- Prepare RiseDev dev cluster"
40+
cargo make pre-start-dev
41+
cargo make link-all-in-one-binaries
42+
43+
host_args="-h localhost -p 4565 -h localhost -p 4566 -h localhost -p 4567"
44+
45+
echo "--- e2e, ci-3cn-3fe-opendal-fs-backend, streaming"
46+
RUST_LOG="info,risingwave_stream=info,risingwave_batch=info,risingwave_storage=info" \
47+
cargo make ci-start ci-3cn-3fe-opendal-fs-backend
48+
sqllogictest ${host_args} -d dev './e2e_test/streaming/**/*.slt' -j 16 --junit "parallel-opendal-fs-backend-${profile}"
49+
50+
echo "--- Kill cluster"
51+
rm -rf /tmp/rw_ci
52+
cargo make ci-kill
53+
54+
55+
echo "--- e2e, ci-3cn-3fe-opendal-fs-backend, batch"
56+
RUST_LOG="info,risingwave_stream=info,risingwave_batch=info,risingwave_storage=info" \
57+
cargo make ci-start ci-3cn-3fe-opendal-fs-backend
58+
sqllogictest ${host_args} -d dev './e2e_test/ddl/**/*.slt' --junit "parallel-opendal-fs-backend-ddl-${profile}"
59+
sqllogictest ${host_args} -d dev './e2e_test/batch/**/*.slt' -j 16 --junit "parallel-opendal-fs-backend-batch-${profile}"
60+
61+
echo "--- Kill cluster"
62+
rm -rf /tmp/rw_ci
63+
cargo make ci-kill

ci/scripts/e2e-test-parallel-in-memory.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@ sqllogictest ${host_args} -d dev './e2e_test/ddl/**/*.slt' --junit "parallel-in
5454
sqllogictest ${host_args} -d dev './e2e_test/batch/**/*.slt' -j 16 --junit "parallel-in-memory-batch-${profile}"
5555

5656
echo "--- Kill cluster"
57-
cargo make ci-kill
57+
cargo make ci-kill

ci/workflows/pull-request.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,21 @@ steps:
113113
timeout_in_minutes: 12
114114
retry: *auto-retry
115115

116+
- label: "end-to-end test for opendal (parallel)"
117+
command: "ci/scripts/e2e-test-parallel-for-opendal.sh -p ci-dev"
118+
depends_on:
119+
- "build"
120+
- "docslt"
121+
plugins:
122+
- gencer/cache#v2.4.10: *cargo-cache
123+
- docker-compose#v4.9.0:
124+
run: rw-build-env
125+
config: ci/docker-compose.yml
126+
mount-buildkite-agent: true
127+
- ./ci/plugins/upload-failure-logs
128+
timeout_in_minutes: 12
129+
retry: *auto-retry
130+
116131
- label: "end-to-end test (parallel, in-memory)"
117132
command: "ci/scripts/e2e-test-parallel-in-memory.sh -p ci-dev"
118133
depends_on: "build"

dashboard/proto/gen/catalog.ts

Lines changed: 102 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dashboard/proto/gen/data.ts

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)