Skip to content

Commit 40f1120

Browse files
committed
Fix pnpm dependency
1 parent f2b565e commit 40f1120

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
FROM rust:latest as builder
22
WORKDIR /app
33
COPY . .
4+
RUN curl -fsSL https://get.pnpm.io/install.sh | sh -
45
# git-fetch-with-cli is a CI bugfix, we should be able to remove it later
56
RUN cargo build --release --bin atomic-server --config net.git-fetch-with-cli=true
67

server/build.rs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,18 @@ fn should_build() -> bool {
5959
fn main() -> std::io::Result<()> {
6060
println!("cargo:rerun-if-changed=../browser");
6161

62+
let pckgmanager = "pnpm";
63+
6264
if should_build() {
63-
p!("pnpm install...");
64-
std::process::Command::new("pnpm")
65-
.current_dir("../browser")
65+
p!("install js packages...");
66+
std::process::Command::new(pckgmanager)
67+
.current_dir("../browser/data-browser")
6668
.args(["install"])
6769
.output()
6870
.expect("failed to install deps");
69-
p!("pnpm build...");
70-
std::process::Command::new("pnpm")
71-
.current_dir("../browser")
71+
p!("build js assets...");
72+
std::process::Command::new(pckgmanager)
73+
.current_dir("../browser/data-browser")
7274
.args(["run", "build"])
7375
.output()
7476
.expect("failed to build js bundle");

0 commit comments

Comments
 (0)