error ci on npm run build fail, fix install-timelord.sh on mac, osx-sign

This commit is contained in:
Gene Hoffman 2020-10-31 19:01:56 -07:00 committed by Yostra
parent 5e965e3e13
commit 5263b46b7d
2 changed files with 8 additions and 4 deletions

View file

@ -12,7 +12,7 @@ echo "Chia Installer Version is: $CHIA_INSTALLER_VERSION"
echo "Installing npm and electron packagers" echo "Installing npm and electron packagers"
npm install electron-installer-dmg -g npm install electron-installer-dmg -g
npm install electron-packager -g npm install electron-packager -g
npm install electron/electron-osx-sign#master --save-dev -g npm install electron/electron-osx-sign #master --save-dev -g
echo "Create dist/" echo "Create dist/"
sudo rm -rf dist sudo rm -rf dist
@ -27,9 +27,13 @@ cd electron-react || exit
echo "npm build" echo "npm build"
npm install npm install
npm run build LAST_EXIT_CODE=$?
if [ "$LAST_EXIT_CODE" -ne 0 ]; then
>&2 echo "npm run build failed!"
exit $LAST_EXIT_CODE
fi
electron-packager . Chia --asar.unpack="**/daemon/**" --platform=darwin --icon=src/assets/img/Chia.icns --overwrite --app-bundle-id=net.chia.blockchain --appVersion=$CHIA_INSTALLER_VERSION electron-packager . Chia --asar.unpack="**/daemon/**" --platform=darwin --icon=src/assets/img/Chia.icns --overwrite --app-bundle-id=net.chia.blockchain --appVersion=$CHIA_INSTALLER_VERSION
electron-osx-sign Chia-darwin-x64/Chia.app --no-gatekeeper-assess --platform=darwin --hardened-runtime --provisioning-profile=chiablockchain.provisionprofile --entitlements=entitlements.mac.plist --entitlements-inherit=entitlements.mac.plist electron-osx-sign Chia-darwin-x64/Chia.app --platform=darwin --hardened-runtime=true --provisioning-profile=chiablockchain.provisionprofile --entitlements=entitlements.mac.plist --entitlements-inherit=entitlements.mac.plist
mv Chia-darwin-x64 ../build_scripts/dist/ mv Chia-darwin-x64 ../build_scripts/dist/
cd ../build_scripts || exit cd ../build_scripts || exit

View file

@ -57,7 +57,7 @@ else
echo venv/bin/python -m pip install --force --no-binary chiavdf "$CHIAVDF_VERSION" echo venv/bin/python -m pip install --force --no-binary chiavdf "$CHIAVDF_VERSION"
venv/bin/python -m pip install --force --no-binary chiavdf "$CHIAVDF_VERSION" venv/bin/python -m pip install --force --no-binary chiavdf "$CHIAVDF_VERSION"
symlink_vdf_bench "$PYTHON_VERSION" symlink_vdf_bench "$PYTHON_VERSION"
elif [ -e venv/bin/python ] && test $MACOS && brew info boost | grep -q 'Not installed'; then elif [ -e venv/bin/python ] && [ test $MACOS ] && [ brew info boost | grep -q 'Not installed' ]; then
echo "Installing chiavdf requirement boost for MacOS" echo "Installing chiavdf requirement boost for MacOS"
brew install boost brew install boost
echo "installing chiavdf from source" echo "installing chiavdf from source"