From 4dfcec7a5db0b9985d43acc43a77bf391b12429a Mon Sep 17 00:00:00 2001 From: Huangjw <1223644280@qq.com> Date: Fri, 31 Mar 2023 11:39:56 +0800 Subject: [PATCH 1/3] chore(release): update release version and fix ci release script --- Cargo.toml | 2 +- README.md | 6 +++--- ci/scripts/release.sh | 6 ++++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 640214a213d91..55fd5550228fa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,7 +49,7 @@ members = [ ] [workspace.package] -version = "0.2.0-alpha" +version = "0.19.0-alpha" edition = "2021" homepage = "https://github.com/risingwavelabs/risingwave" keywords = ["sql", "database", "streaming"] diff --git a/README.md b/README.md index cfa304cccb2c4..cf2f373712b49 100644 --- a/README.md +++ b/README.md @@ -26,9 +26,9 @@ There are two ways to install RisingWave: use a pre-built package or compile fro ```shell # Download the pre-built binary -wget https://github.com/risingwavelabs/risingwave/releases/download/v0.1.17/risingwave-v0.1.17-x86_64-unknown-linux.tar.gz +wget https://github.com/risingwavelabs/risingwave/releases/download/v0.18.0/risingwave-v0.18.0-x86_64-unknown-linux.tar.gz # Unzip the binary -tar xvf risingwave-v0.1.17-x86_64-unknown-linux.tar.gz +tar xvf risingwave-v0.18.0-x86_64-unknown-linux.tar.gz # Start RisingWave in single-binary playground mode ./risingwave playground ``` @@ -37,7 +37,7 @@ tar xvf risingwave-v0.1.17-x86_64-unknown-linux.tar.gz ```shell # Start RisingWave in single-binary playground mode -docker run -it --pull=always -p 4566:4566 -p 5691:5691 ghcr.io/risingwavelabs/risingwave:v0.1.17 playground +docker run -it --pull=always -p 4566:4566 -p 5691:5691 ghcr.io/risingwavelabs/risingwave:v0.18.0 playground ``` **Compile from Source with [RiseDev](docs/developer-guide.md#set-up-the-development-environment) (Linux and macOS)** diff --git a/ci/scripts/release.sh b/ci/scripts/release.sh index 041c0c24611b9..649a52a2723a5 100755 --- a/ci/scripts/release.sh +++ b/ci/scripts/release.sh @@ -10,6 +10,12 @@ if [ "${BUILDKITE_SOURCE}" != "schedule" ] && [ "${BUILDKITE_SOURCE}" != "webhoo exit 0 fi +echo "--- Install java and maven" +yum install -y java-11-openjdk wget +wget https://dlcdn.apache.org/maven/maven-3/3.9.1/binaries/apache-maven-3.9.1-bin.tar.gz && tar -zxvf apache-maven-3.9.1-bin.tar.gz +export PATH="${REPO_ROOT}/apache-maven-3.9.1/bin:$PATH" +mvn -v + echo "--- Install rust" curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --no-modify-path --default-toolchain $(cat ./rust-toolchain) -y source "$HOME/.cargo/env" From 3e10a9a1782e62718070d8799c0192a80ec03d56 Mon Sep 17 00:00:00 2001 From: Jianwei Huang <1223644280@qq.com> Date: Mon, 3 Apr 2023 16:57:12 +0800 Subject: [PATCH 2/3] fix cargo.lock --- Cargo.lock | 78 ++++++++++++++++++++-------------------- Cargo.toml | 2 +- src/sqlparser/Cargo.toml | 2 +- 3 files changed, 41 insertions(+), 41 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cd5df85e12eb3..90d6bc9a99644 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3483,7 +3483,7 @@ checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] name = "local_stats_alloc" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "workspace-hack", ] @@ -4671,7 +4671,7 @@ dependencies = [ [[package]] name = "pgwire" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "anyhow", "async-trait", @@ -5654,7 +5654,7 @@ dependencies = [ [[package]] name = "risedev" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "anyhow", "chrono", @@ -5682,7 +5682,7 @@ dependencies = [ [[package]] name = "risingwave_backup" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "anyhow", "async-trait", @@ -5702,7 +5702,7 @@ dependencies = [ [[package]] name = "risingwave_backup_cmd" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "clap 4.1.11", "madsim-tokio", @@ -5713,7 +5713,7 @@ dependencies = [ [[package]] name = "risingwave_batch" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "anyhow", "assert_matches", @@ -5755,7 +5755,7 @@ dependencies = [ [[package]] name = "risingwave_bench" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "async-trait", "aws-config", @@ -5790,7 +5790,7 @@ dependencies = [ [[package]] name = "risingwave_cmd" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "anyhow", "clap 4.1.11", @@ -5810,7 +5810,7 @@ dependencies = [ [[package]] name = "risingwave_cmd_all" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "anyhow", "clap 4.1.11", @@ -5833,7 +5833,7 @@ dependencies = [ [[package]] name = "risingwave_common" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "anyhow", "arc-swap", @@ -5902,7 +5902,7 @@ dependencies = [ [[package]] name = "risingwave_common_proc_macro" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "bae", "proc-macro-error", @@ -5914,7 +5914,7 @@ dependencies = [ [[package]] name = "risingwave_common_service" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "async-trait", "hyper", @@ -5932,7 +5932,7 @@ dependencies = [ [[package]] name = "risingwave_compaction_test" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "anyhow", "async-trait", @@ -5959,7 +5959,7 @@ dependencies = [ [[package]] name = "risingwave_compactor" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "anyhow", "async-trait", @@ -5983,7 +5983,7 @@ dependencies = [ [[package]] name = "risingwave_compute" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "anyhow", "async-trait", @@ -6026,7 +6026,7 @@ dependencies = [ [[package]] name = "risingwave_connector" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "anyhow", "apache-avro", @@ -6092,7 +6092,7 @@ dependencies = [ [[package]] name = "risingwave_ctl" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "anyhow", "bytes", @@ -6122,7 +6122,7 @@ dependencies = [ [[package]] name = "risingwave_e2e_extended_mode_test" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "anyhow", "chrono", @@ -6137,7 +6137,7 @@ dependencies = [ [[package]] name = "risingwave_expr" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "aho-corasick", "anyhow", @@ -6184,7 +6184,7 @@ dependencies = [ [[package]] name = "risingwave_frontend" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "anyhow", "arc-swap", @@ -6247,7 +6247,7 @@ dependencies = [ [[package]] name = "risingwave_hummock_sdk" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "bytes", "hex", @@ -6265,7 +6265,7 @@ dependencies = [ [[package]] name = "risingwave_hummock_test" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "async-stream", "async-trait", @@ -6314,7 +6314,7 @@ dependencies = [ [[package]] name = "risingwave_meta" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "anyhow", "arc-swap", @@ -6379,7 +6379,7 @@ dependencies = [ [[package]] name = "risingwave_object_store" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "async-trait", "await-tree", @@ -6406,7 +6406,7 @@ dependencies = [ [[package]] name = "risingwave_pb" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "enum-as-inner", "madsim-tonic", @@ -6421,7 +6421,7 @@ dependencies = [ [[package]] name = "risingwave_planner_test" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "anyhow", "backtrace", @@ -6442,7 +6442,7 @@ dependencies = [ [[package]] name = "risingwave_regress_test" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "anyhow", "clap 4.1.11", @@ -6456,7 +6456,7 @@ dependencies = [ [[package]] name = "risingwave_rpc_client" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "anyhow", "async-trait", @@ -6481,7 +6481,7 @@ dependencies = [ [[package]] name = "risingwave_rt" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "await-tree", "console", @@ -6537,7 +6537,7 @@ dependencies = [ [[package]] name = "risingwave_source" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "anyhow", "assert_matches", @@ -6559,7 +6559,7 @@ dependencies = [ [[package]] name = "risingwave_sqlparser" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "itertools", "matches", @@ -6586,7 +6586,7 @@ dependencies = [ [[package]] name = "risingwave_sqlsmith" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "anyhow", "chrono", @@ -6609,7 +6609,7 @@ dependencies = [ [[package]] name = "risingwave_state_cleaning_test" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "anyhow", "chrono", @@ -6630,7 +6630,7 @@ dependencies = [ [[package]] name = "risingwave_storage" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "arc-swap", "async-trait", @@ -6690,7 +6690,7 @@ dependencies = [ [[package]] name = "risingwave_stream" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "anyhow", "assert_matches", @@ -6748,7 +6748,7 @@ dependencies = [ [[package]] name = "risingwave_test_runner" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "fail", "sync-point", @@ -6757,7 +6757,7 @@ dependencies = [ [[package]] name = "risingwave_tracing" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "anyhow", "futures", @@ -8829,7 +8829,7 @@ dependencies = [ [[package]] name = "workspace-config" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "isahc", "log", @@ -8840,7 +8840,7 @@ dependencies = [ [[package]] name = "workspace-hack" -version = "0.2.0-alpha" +version = "1.0.0-alpha" dependencies = [ "ahash 0.8.3", "anyhow", diff --git a/Cargo.toml b/Cargo.toml index 55fd5550228fa..38dbfad7bb9b4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -49,7 +49,7 @@ members = [ ] [workspace.package] -version = "0.19.0-alpha" +version = "1.0.0-alpha" edition = "2021" homepage = "https://github.com/risingwavelabs/risingwave" keywords = ["sql", "database", "streaming"] diff --git a/src/sqlparser/Cargo.toml b/src/sqlparser/Cargo.toml index b7e0578473288..95e6c508e05ca 100644 --- a/src/sqlparser/Cargo.toml +++ b/src/sqlparser/Cargo.toml @@ -30,7 +30,7 @@ serde = { version = "1.0", features = ["derive"], optional = true } tracing = "0.1" [target.'cfg(not(madsim))'.dependencies] -workspace-hack = { version = "0.2.0-alpha", path = "../workspace-hack" } +workspace-hack = { path = "../workspace-hack" } [dev-dependencies] matches = "0.1" From dbbd98b00e43bd0d2046164120f790db3a095552 Mon Sep 17 00:00:00 2001 From: Jianwei Huang <1223644280@qq.com> Date: Mon, 3 Apr 2023 17:54:47 +0800 Subject: [PATCH 3/3] update cargo.toml version in release version --- ci/scripts/release.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ci/scripts/release.sh b/ci/scripts/release.sh index 649a52a2723a5..bd5cc7d33f386 100755 --- a/ci/scripts/release.sh +++ b/ci/scripts/release.sh @@ -11,7 +11,8 @@ if [ "${BUILDKITE_SOURCE}" != "schedule" ] && [ "${BUILDKITE_SOURCE}" != "webhoo fi echo "--- Install java and maven" -yum install -y java-11-openjdk wget +yum install -y java-11-openjdk wget python3 +pip3 install toml-cli wget https://dlcdn.apache.org/maven/maven-3/3.9.1/binaries/apache-maven-3.9.1-bin.tar.gz && tar -zxvf apache-maven-3.9.1-bin.tar.gz export PATH="${REPO_ROOT}/apache-maven-3.9.1/bin:$PATH" mvn -v @@ -36,6 +37,9 @@ echo "--- Install aws cli" curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" unzip -q awscliv2.zip && ./aws/install && mv /usr/local/bin/aws /bin/aws +echo "--- Update risingwave release version" +toml set --toml-path Cargo.toml workspace.package.version ${BUILDKITE_TAG#*v} + echo "--- Build risingwave release binary" cargo build -p risingwave_cmd_all --features "static-link static-log-level" --profile release cargo build --bin risectl --features "static-link static-log-level" --profile release