Skip to content

Commit

Permalink
fix(all): yarn vs npm on MSFT.
Browse files Browse the repository at this point in the history
  • Loading branch information
rodrigorodriguez committed Jan 24, 2022
1 parent f11e1f9 commit b116026
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 18 deletions.
14 changes: 0 additions & 14 deletions deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -83,20 +83,6 @@ echo "[General Bots Deployer] Transpiling..."
eval ./node_modules/typescript/bin/tsc -v
eval ./node_modules/typescript/bin/tsc -p "$DEPLOYMENT_SOURCE"

# 1.1 Install default.gbui npm packages
if [ -e "$DEPLOYMENT_SOURCE/packages/default.gbui/package.json" ]; then
echo "[General Bots Deployer] Running npm install for default.gbui..."
cd "$DEPLOYMENT_SOURCE/packages/default.gbui"
eval yarn install
exitWithMessageOnError "npm failed"
echo "[Genseral Bots Deployer] Building react app..."
eval npm run build
echo "[General Bots Deployer] OK."
cd "$DEPLOYMENT_SOURCE"
exitWithMessageOnError "react build failed"
cd - > /dev/null
fi


echo "[General Bots Deployer] OK."

Expand Down
8 changes: 4 additions & 4 deletions packages/core.gbapp/services/GBDeployer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -807,12 +807,12 @@ export class GBDeployer implements IGBDeployer {

// Install modules and compiles the web app.

// GBLog.info(`Installing modules default.gbui (It may take a few minutes)...`);
GBLog.info(`Installing modules default.gbui (It may take a few minutes)...`);

// child_process.execSync(`${npm} install`, { cwd: root });
child_process.execSync(`yarn install`, { cwd: root });

// GBLog.info(`Transpiling default.gbui...`);
// child_process.execSync(`${npm} run build`, { cwd: root });
GBLog.info(`Transpiling default.gbui...`);
child_process.execSync(`${npm} run build`, { cwd: root });
}
}

Expand Down

0 comments on commit b116026

Please sign in to comment.