Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: use embedded dashboard in Linux binary release #15836

Merged
merged 6 commits into from
Mar 22, 2024
Merged

chore: use embedded dashboard in Linux binary release #15836

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3d74ce6
chore: use embedded dashboard in Linux binary release
BugenZhao Mar 21, 2024
b9eb7a1
move typescript out of `devDep`
BugenZhao Mar 21, 2024
83f4494
do not set node_env by ourselves, let nextjs manage it
BugenZhao Mar 21, 2024
abd48b9
revert typescript dep change
BugenZhao Mar 21, 2024
dc04e1c
cd back 🤡
BugenZhao Mar 21, 2024
ac0ded7
fix clippy
BugenZhao Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions ci/scripts/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ unzip -o protoc-3.15.8-linux-${PROTOC_ARCH}.zip -d protoc
mv ./protoc/bin/protoc /usr/local/bin/
mv ./protoc/include/* /usr/local/include/

echo "--- Install nodejs"
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
export NVM_DIR="$HOME/.nvm"
. "$NVM_DIR/nvm.sh"
cd dashboard && nvm install && nvm use

echo "--- Check risingwave release version"
if [[ -n "${BUILDKITE_TAG}" ]]; then
CARGO_PKG_VERSION="$(toml get --toml-path Cargo.toml workspace.package.version)"
Expand All @@ -59,9 +65,7 @@ if [[ -n "${BUILDKITE_TAG}" ]]; then
fi

echo "--- Build risingwave release binary"
# TODO(bugen): It's really hard to get the dashboard built on such old distro.
# The assets will be proxied to GitHub during runtime.
# export ENABLE_BUILD_DASHBOARD=1
export ENABLE_BUILD_DASHBOARD=1
cargo build -p risingwave_cmd_all --features "rw-static-link" --profile release
cargo build -p risingwave_cmd --bin risectl --features "rw-static-link" --profile release
cd target/release && chmod +x risingwave risectl
Expand Down
2 changes: 1 addition & 1 deletion dashboard/.node-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v20.11.0
v20.11.1
1 change: 1 addition & 0 deletions dashboard/.nvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.node-version
54 changes: 26 additions & 28 deletions dashboard/package-lock.json
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions dashboard/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@
"react-syntax-highlighter": "^15.5.0",
"recharts": "^2.3.2",
"styled-components": "5.3.0",
"ts-proto": "^1.156.2"
"ts-proto": "^1.169.1",
"typescript": "5.4.2"

This comment was marked as outdated.

Sign in to view

},
"devDependencies": {
"@testing-library/jest-dom": "^5.16.2",
Expand All @@ -61,8 +62,7 @@
"eslint-plugin-react": "^7.31.6",
"express": "^4.18.1",
"prettier": "^2.7.1",
"prettier-plugin-organize-imports": "^3.1.1",
"typescript": "5.4.2"
"prettier-plugin-organize-imports": "^3.1.1"
},
"overrides": {
"react-json-view": {
Expand Down
6 changes: 3 additions & 3 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ FROM base AS rust-base

RUN apt-get update && apt-get -y install make cmake protobuf-compiler curl bash lld unzip

# Install Node.js as requirement for building the dashboard.
# Install Node.js as dependency for building the dashboard.
# Bump version together with `dashboard/.node-version`.
ENV NVM_DIR /root/.nvm
ENV NVM_VERSION 0.39.7
ENV NODE_VERSION 20.11.1
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v$NVM_VERSION/install.sh | bash \
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash \
&& . $NVM_DIR/nvm.sh \
&& nvm install $NODE_VERSION
ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
Expand Down
Loading