Skip to content

Commit

Permalink
Merge branch 'main' into xxh/doris_sink
Browse files Browse the repository at this point in the history
  • Loading branch information
xxhZs committed Sep 19, 2023
2 parents f8be28c + eb92f6f commit 34f22f3
Show file tree
Hide file tree
Showing 129 changed files with 2,926 additions and 1,176 deletions.
444 changes: 167 additions & 277 deletions Cargo.lock

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions backwards-compat-tests/slt/tpch-backwards-compat/seed.slt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ SET RW_IMPLICIT_FLUSH TO true;
statement ok
SET QUERY_MODE TO distributed;

statement ok
SET CREATE_COMPACTION_GROUP_FOR_MV TO true;

include ../tpch/create_tables.slt.part

include ../tpch/insert_customer.slt.part
Expand Down
1 change: 1 addition & 0 deletions ci/scripts/run-e2e-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ echo "--- e2e, $mode, batch"
RUST_LOG="info,risingwave_stream=info,risingwave_batch=info,risingwave_storage=info" \
cluster_start
sqllogictest -p 4566 -d dev './e2e_test/ddl/**/*.slt' --junit "batch-ddl-${profile}"
sqllogictest -p 4566 -d dev './e2e_test/background_ddl/**/*.slt' --junit "batch-ddl-${profile}"
sqllogictest -p 4566 -d dev './e2e_test/visibility_mode/*.slt' --junit "batch-${profile}"
sqllogictest -p 4566 -d dev './e2e_test/database/prepare.slt'
sqllogictest -p 4566 -d test './e2e_test/database/test.slt'
Expand Down
2 changes: 1 addition & 1 deletion ci/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ steps:
DOCKER_TOKEN: docker-token
retry: *auto-retry

- label: "release"
- label: "pre build binary"
command: "ci/scripts/release.sh"
plugins:
- seek-oss/aws-sm#v2.3.1:
Expand Down
63 changes: 63 additions & 0 deletions ci/workflows/main-cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -581,3 +581,66 @@ steps:
- "17"
timeout_in_minutes: 10
retry: *auto-retry

- label: "release"
command: "ci/scripts/release.sh"
if: build.tag != null
plugins:
- seek-oss/aws-sm#v2.3.1:
env:
GITHUB_TOKEN: github-token
- docker-compose#v4.9.0:
run: release-env
config: ci/docker-compose.yml
mount-buildkite-agent: true
environment:
- GITHUB_TOKEN
- BUILDKITE_TAG
- BUILDKITE_SOURCE
timeout_in_minutes: 60
retry: *auto-retry

- label: "release docker image: amd64"
command: "ci/scripts/docker.sh"
key: "build-amd64"
if: build.tag != null
plugins:
- seek-oss/aws-sm#v2.3.1:
env:
GHCR_USERNAME: ghcr-username
GHCR_TOKEN: ghcr-token
DOCKER_TOKEN: docker-token
GITHUB_TOKEN: github-token
timeout_in_minutes: 60
retry: *auto-retry

- label: "docker-build-push: aarch64"
command: "ci/scripts/docker.sh"
key: "build-aarch64"
if: build.tag != null
plugins:
- seek-oss/aws-sm#v2.3.1:
env:
GHCR_USERNAME: ghcr-username
GHCR_TOKEN: ghcr-token
DOCKER_TOKEN: docker-token
GITHUB_TOKEN: github-token
timeout_in_minutes: 60
agents:
queue: "linux-arm64"
retry: *auto-retry

- label: "multi arch image create push"
command: "ci/scripts/multi-arch-docker.sh"
if: build.tag != null
depends_on:
- "build-amd64"
- "build-aarch64"
plugins:
- seek-oss/aws-sm#v2.3.1:
env:
GHCR_USERNAME: ghcr-username
GHCR_TOKEN: ghcr-token
DOCKER_TOKEN: docker-token
timeout_in_minutes: 10
retry: *auto-retry
1 change: 1 addition & 0 deletions dashboard/components/Layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ function Layout({ children }: { children: React.ReactNode }) {
<VStack width="full" alignItems="flex-start" px={3}>
<NavTitle>Debug</NavTitle>
<NavButton href="/await_tree/">Await Tree Dump</NavButton>
<NavButton href="/heap_profiling/">Heap Profiling</NavButton>
</VStack>
<VStack mb={3}></VStack>
<NavButton href="/settings/">Settings</NavButton>
Expand Down
14 changes: 14 additions & 0 deletions dashboard/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"@monaco-editor/react": "^4.4.6",
"@types/d3": "^7.4.0",
"@types/lodash": "^4.14.184",
"base64url": "^3.0.1",
"bootstrap-icons": "^1.9.1",
"d3": "^7.6.1",
"d3-axis": "^3.0.0",
Expand Down
Loading

0 comments on commit 34f22f3

Please sign in to comment.