[ARVADOS-WORKBENCH2] updated: 1.2.0-120-ge7a3d6c

Git user git at public.curoverse.com
Tue Aug 21 15:48:04 EDT 2018


Summary of changes:
 package.json  | 2 +-
 src/index.tsx | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

       via  e7a3d6c396fc36acf84ca9b152374b29d208816c (commit)
      from  2c2bd28224c2480276ae714c54ab1be0a6896efd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit e7a3d6c396fc36acf84ca9b152374b29d208816c
Author: Daniel Kos <daniel.kos at contractors.roche.com>
Date:   Tue Aug 21 21:47:57 2018 +0200

    Fix setting build number
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Daniel Kos <daniel.kos at contractors.roche.com>

diff --git a/package.json b/package.json
index b9484c5..0e6435e 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
   },
   "scripts": {
     "start": "react-scripts-ts start",
-    "build": "react-scripts-ts build",
+    "build": "REACT_APP_BUILD_NUMBER=$BUILD_NUMBER REACT_APP_GIT_COMMIT=$GIT_COMMIT react-scripts-ts build",
     "test": "react-scripts-ts test --env=jsdom",
     "eject": "react-scripts-ts eject",
     "lint": "tslint src/** -t verbose"
diff --git a/src/index.tsx b/src/index.tsx
index b368d3f..bee08c8 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -28,8 +28,8 @@ import { collectionFilesItemActionSet } from './views-components/context-menu/ac
 import { collectionActionSet } from './views-components/context-menu/action-sets/collection-action-set';
 import { collectionResourceActionSet } from './views-components/context-menu/action-sets/collection-resource-action-set';
 
-const getBuildNumber = () => "BN-" + (process.env.BUILD_NUMBER || "dev");
-const getGitCommit = () => "GIT-" + (process.env.GIT_COMMIT || "latest").substr(0, 7);
+const getBuildNumber = () => "BN-" + (process.env.REACT_APP_BUILD_NUMBER || "dev");
+const getGitCommit = () => "GIT-" + (process.env.REACT_APP_GIT_COMMIT || "latest").substr(0, 7);
 const getBuildInfo = () => getBuildNumber() + " / " + getGitCommit();
 
 const buildInfo = getBuildInfo();

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list