From: Tom Clegg <tom@curii.com>
Date: Thu, 10 Mar 2022 15:22:52 +0000 (-0500)
Subject: 18700: Update yarn build cmd, add VERSION, BUILD_NUMBER, GIT_COMMIT.
X-Git-Tag: 2.5.0~214^2~32
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/5d4a115fc4a6d0d4c85bc85bbc4d257490d38d67

18700: Update yarn build cmd, add VERSION, BUILD_NUMBER, GIT_COMMIT.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
---

diff --git a/lib/install/deps.go b/lib/install/deps.go
index 69db3e4efd..d4b79ace23 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -501,7 +501,7 @@ rm -rf build
 
 		if err = inst.runBash(`
 cd /var/lib/arvados/arvados-workbench2
-yarn install --non-interactive
+yarn install
 `, stdout, stderr); err != nil {
 			return 1
 		}
@@ -511,7 +511,7 @@ yarn install --non-interactive
 		// Install workbench2 app to /var/lib/arvados/workbench2/
 		if err = inst.runBash(`
 cd /var/lib/arvados/arvados-workbench2
-yarn build
+VERSION="`+inst.PackageVersion+`" BUILD_NUMBER=1 GIT_COMMIT="`+workbench2version+`" yarn build
 rsync -a --delete-after build/ /var/lib/arvados/workbench2/
 `, stdout, stderr); err != nil {
 			return 1