From db39eacfa1fa15b3f4aaa44e6469f71d58b4d07b Mon Sep 17 00:00:00 2001 From: Asher Date: Mon, 20 May 2019 11:02:36 -0500 Subject: [PATCH] Set NODE_ENV and VERSION when building (#700) * Set NODE_ENV and VERSION when building Should fix the version flag not reporting correctly as well as enable the service worker and prevent the 404 hmr requests again. * Log env vars To help make sure it's built correctly when looking at the Travis logs. --- build/tasks.ts | 6 ++++++ scripts/build.sh | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/build/tasks.ts b/build/tasks.ts index 45d171cf1..9e5a4c6da 100644 --- a/build/tasks.ts +++ b/build/tasks.ts @@ -1,4 +1,5 @@ import { register, run } from "@coder/runner"; +import { logger, field } from "@coder/logger"; import * as fs from "fs"; import * as fse from "fs-extra"; import * as os from "os"; @@ -17,6 +18,11 @@ const vscodeVersion = process.env.VSCODE_VERSION || "1.33.1"; const vsSourceUrl = `https://codesrv-ci.cdr.sh/vstar-${vscodeVersion}.tar.gz`; const buildServerBinary = register("build:server:binary", async (runner) => { + logger.info("Building with environment", field("env", { + NODE_ENV: process.env.NODE_ENV, + VERSION: process.env.VERSION, + })); + await ensureInstalled(); await Promise.all([ buildBootstrapFork(), diff --git a/scripts/build.sh b/scripts/build.sh index 2c7c0dff2..2a7fbdb56 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -15,13 +15,13 @@ function docker_build() { docker cp ./. $containerID:/src exec "cd /src && yarn" exec "cd /src && npm rebuild" - exec "cd /src && yarn task build:server:binary" + exec "cd /src && NODE_ENV=production VERSION=$VERSION yarn task build:server:binary" exec "cd /src && yarn task package $VERSION" docker cp $containerID:/src/release/. ./release/ } if [[ "$OSTYPE" == "darwin"* ]]; then - yarn task build:server:binary + NODE_ENV=production yarn task build:server:binary else if [[ "$TARGET" == "alpine" ]]; then IMAGE="codercom/nbin-alpine"