File tree Expand file tree Collapse file tree 2 files changed +11
-5
lines changed Expand file tree Collapse file tree 2 files changed +11
-5
lines changed Original file line number Diff line number Diff line change 11FROM rust:latest as builder
22WORKDIR /app
33COPY . .
4+ ENV SHELL=bash
45RUN curl -fsSL https://get.pnpm.io/install.sh | sh -
56# git-fetch-with-cli is a CI bugfix, we should be able to remove it later
67RUN cargo build --release --bin atomic-server --config net.git-fetch-with-cli=true
Original file line number Diff line number Diff line change @@ -59,21 +59,26 @@ fn should_build() -> bool {
5959fn main ( ) -> std:: io:: Result < ( ) > {
6060 println ! ( "cargo:rerun-if-changed=../browser" ) ;
6161
62- let pckgmanager = "pnpm" ;
62+ let pkg_manager = "pnpm" ;
6363
6464 if should_build ( ) {
6565 p ! ( "install js packages..." ) ;
66- std:: process:: Command :: new ( pckgmanager )
66+ std:: process:: Command :: new ( pkg_manager )
6767 . current_dir ( "../browser/data-browser" )
6868 . args ( [ "install" ] )
6969 . output ( )
70- . expect ( "failed to install deps" ) ;
70+ . unwrap_or_else ( |_| {
71+ panic ! (
72+ "Failed to install js packages. Make sure you have {} installed." ,
73+ pkg_manager
74+ )
75+ } ) ;
7176 p ! ( "build js assets..." ) ;
72- std:: process:: Command :: new ( pckgmanager )
77+ std:: process:: Command :: new ( pkg_manager )
7378 . current_dir ( "../browser/data-browser" )
7479 . args ( [ "run" , "build" ] )
7580 . output ( )
76- . expect ( "failed to build js bundle" ) ;
81+ . expect ( "Failed to build js bundle" ) ;
7782 }
7883
7984 resource_dir ( JS_DIST )
You can’t perform that action at this time.
0 commit comments