git.iko.soy/bridge
on master help sign in
qol: refactor bridge version env vars

This addresses PR feedback: - Provide an env var to unify zip filename and UI label - Also, consume it in `flags`.

commit7cb7f440f790e86972f3609543725b97d314bd2a authortomholford <tomholford@users.noreply.github.com> dateFri 23 Jul 2021, 16:03 (5 years ago) parent9b0964b
2 files changed+4−3
compare with master
unifiedsplit
package.json+2−2 src/lib/flags.js+2−1
package.json+2−2
@@ -100,9 +100,9 @@
100100 "test": "react-scripts test --env=jsdom",
101101 "eject": "react-scripts eject",
102102 "checksum": "cd build && find . -exec shasum -a256 {} ';' > ../checksums.txt && cd ..",
103− "zip": "BRIDGE_VERSION=${BRIDGE_VERSION:-$npm_package_version}; zip -ur bridge-$BRIDGE_VERSION.zip README.md bridge-https.py checksums.txt && cd build && zip -ur ../bridge-$BRIDGE_VERSION.zip ./* && cd .. && unset bridgeVersion",
103+ "zip": "BRIDGE_VERSION=${REACT_APP_BRIDGE_VERSION:-$npm_package_version}; zip -ur bridge-$BRIDGE_VERSION.zip README.md bridge-https.py checksums.txt && cd build && zip -ur ../bridge-$BRIDGE_VERSION.zip ./* && cd ..",
104104 "release": "npm install && npm run build && npm run checksum && npm run zip",
105− "release:ropsten": "npm install && npm run build:ropsten && npm run checksum && BRIDGE_VERSION=$npm_package_version\"r\" npm run zip",
105+ "release:ropsten": "export REACT_APP_BRIDGE_VERSION=$npm_package_version\"r\"; npm install && npm run build:ropsten && npm run checksum && npm run zip",
106106 "pilot:ganache": "ganache-cli --blockTime 1 --networkId 5 --host '0.0.0.0' -m 'benefit crew supreme gesture quantum web media hazard theory mercy wing kitten' > /dev/null &",
107107 "pilot:setup": "npm run pilot:ganache && truffle deploy",
108108 "pilot": "HTTPS=true npm-run-all pilot:setup start pilot:cleanup --continue-on-error",
src/lib/flags.js+2−1
@@ -3,4 +3,5 @@ import { version } from '../../package.json';
33// are we running bridge in a development build
44export const isDevelopment = process.env.NODE_ENV === 'development';
55export const isRopsten = process.env.REACT_APP_ROPSTEN === 'true';
6−export const versionLabel = `${version}${isRopsten ? 'r' : ''}`;
6+export const versionLabel =
7+ process.env.REACT_APP_BRIDGE_VERSION || `${version}${isRopsten ? 'r' : ''}`;