diff --git a/scripts/release-desktop.sh b/scripts/release-desktop.sh new file mode 100755 index 0000000000000000000000000000000000000000..df7f8021336b25d59faa765f878692512c611702 --- /dev/null +++ b/scripts/release-desktop.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +# Get to the root project +if [[ "_" == "_${PROJECT_DIR}" ]]; then + SCRIPT_DIR=$(dirname $0) + PROJECT_DIR=$(cd ${SCRIPT_DIR}/.. && pwd) + export PROJECT_DIR +fi; + +cd ${PROJECT_DIR} + +# Preparing the environment +. ${PROJECT_DIR}/scripts/env-global.sh +if [[ $? -ne 0 ]]; then + exit 1 +fi + +if [[ -d "${PROJECT_DIR}/dist/desktop" ]]; then + cd "${PROJECT_DIR}/dist/desktop" + + # Fetch last updates + git fetch origin && git merge origin/master || exit 1 + + # Build desktop assets + ./release.sh $1 + if [[ $? -ne 0 ]]; then + exit 1 + fi +else + echo "ERROR: dist/desktop not found -> Make sure git submodule has been init!" + exit 1 +fi; diff --git a/scripts/release.sh b/scripts/release.sh index a23084849f8fc7ef079e5cf2ada9ba1669b2348b..5239f7ce35f69a08c2fc96f304bf54f59d1148c7 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -75,7 +75,7 @@ case "$1" in esac -# Preparing Android environment +# Preparing the environment . ${PROJECT_DIR}/scripts/env-global.sh if [[ $? -ne 0 ]]; then exit 1 @@ -151,6 +151,10 @@ if [[ $? -ne 0 ]]; then exit 1 fi +echo "----------------------------------" +echo "- Push git android project..." +echo "----------------------------------" + # Commit android project cd ${PROJECT_DIR}/platforms/android || exit 1 git reset HEAD @@ -162,11 +166,11 @@ git push origin "v$2" # Push the master branch git push origin if [[ $? -ne 0 ]]; then - exit 1 + echo "ERROR: cannot push platform/android project ! Continue anyway..." fi echo "**********************************" -echo "* Upload web extension to Modzilla..." +echo "* Upload web extension to {addons.modzilla.org} ..." echo "**********************************" if [[ "_" == "_${AMO_JWT_ISSUER}" ||Â "_" == "_${AMO_JWT_SECRET}" ]]; then echo "WARN: Cannot send webExtension to Modzilla: missing env variable 'AMO_JWT_ISSUER' or 'AMO_JWT_SECRET'. Use local file './local/env.sh' to define it, then retry." @@ -178,7 +182,7 @@ else fi echo "**********************************" -echo "* Uploading artifacts to Github..." +echo "* Uploading artifacts to {github.com} ..." echo "**********************************" # Pause (wait propagation to from git.duniter.org to github) echo " Waiting 40s, for propagation to github..." @@ -189,28 +193,15 @@ if [[ $? -ne 0 ]]; then exit 1 fi - echo "----------------------------------" echo "- Building desktop artifacts..." echo "----------------------------------" +. ${PROJECT_DIR}/scripts/release-desktop.sh $2 +if [[ $? -ne 0 ]]; then + exit 1 +fi -if [[ -d "${PROJECT_DIR}/dist/desktop" ]]; then - cd "${PROJECT_DIR}/dist/desktop" - - # Fetch last updates - git fetch origin && git merge origin/master || exit 1 - - # Build desktop assets - ./release.sh $2 - if [[ $? -ne 0 ]]; then - exit 1 - fi -else - echo "ERROR: dist/desktop not found -> Make sure git submodule has been init!" - exit 1 -fi; - # Back to nodejs cd ${PROJECT_DIR} nvm use ${NODEJS_VERSION}