If a version number is supplied to the build command, make sure to report that

version number in the web interface (top left).

No issue #

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege@veritasgenetics.com>

diff --git a/package.json b/package.json
index 0e5805a3774981c97c71bd77a09e569fe27caec9..68d23bfaaab79b07b71fc077a0df18bb381a1b8c 100644 (file)
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
   },
   "scripts": {
     "start": "react-scripts-ts start",
-    "build": "REACT_APP_BUILD_NUMBER=$BUILD_NUMBER REACT_APP_GIT_COMMIT=$GIT_COMMIT react-scripts-ts build",
+    "build": "REACT_APP_VERSION=$VERSION REACT_APP_BUILD_NUMBER=$BUILD_NUMBER REACT_APP_GIT_COMMIT=$GIT_COMMIT react-scripts-ts build",
     "build-local": "react-scripts-ts build",
     "test": "CI=true react-scripts-ts test --env=jsdom",
     "test-local": "react-scripts-ts test --env=jsdom",

diff --git a/src/common/app-info.ts b/src/common/app-info.ts
index cd274835685490a9fad76bc5050fa09daf8bb897..de6708eb636495e55eecd8fe3e5112546f92c2d5 100644 (file)
--- a/src/common/app-info.ts
+++ b/src/common/app-info.ts
@@ -3,7 +3,11 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 export const getBuildInfo = (): string => {
-    const getBuildNumber = "BN-" + (process.env.REACT_APP_BUILD_NUMBER || "dev");
-    const getGitCommit = "GIT-" + (process.env.REACT_APP_GIT_COMMIT || "latest").substr(0, 7);
-    return getBuildNumber + " / " + getGitCommit;
-};
\ No newline at end of file
+    if (process.env.REACT_APP_VERSION) {
+      return "v" + process.env.REACT_APP_VERSION;
+    } else {
+      const getBuildNumber = "BN-" + (process.env.REACT_APP_BUILD_NUMBER || "dev");
+      const getGitCommit = "GIT-" + (process.env.REACT_APP_GIT_COMMIT || "latest").substr(0, 7);
+      return getBuildNumber + " / " + getGitCommit;
+    }
+};