From 339141417362dc00f973e63ed9ff69a722106924 Mon Sep 17 00:00:00 2001 From: cgeek <cem.moreau@gmail.com> Date: Wed, 17 May 2017 21:17:43 +0200 Subject: [PATCH] [enh] Set the exact modules version of production software in build.* --- release/arch/arm/build-arm.sh | 16 +++++++++++----- release/arch/debian/build-deb.sh | 8 +++++++- release/arch/windows/build.bat | 17 ++++++++++++----- 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/release/arch/arm/build-arm.sh b/release/arch/arm/build-arm.sh index 4ffb76dd1..b054cab26 100755 --- a/release/arch/arm/build-arm.sh +++ b/release/arch/arm/build-arm.sh @@ -4,6 +4,12 @@ export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm +VER_UI=1.1.5 +VER_BMA=1.1.2 +VER_CRAWLER=1.1.4 +VER_PROVER=1.1.2 +VER_KEYPAIR=1.1.3 + # Prepare ARCH="armv7l" NVER="v6.10.2" @@ -66,11 +72,11 @@ SRC=`pwd` echo $SRC # Install modules -node/bin/npm install duniter-bma --save --production -node/bin/npm install duniter-crawler --save --production -node/bin/npm install duniter-keypair --save --production -node/bin/npm install duniter-prover --save --production -node/bin/npm install duniter-ui --production --save +node/bin/npm install "duniter-bma@$VER_BMA" --save --production +node/bin/npm install "duniter-crawler@$VER_CRAWLER" --save --production +node/bin/npm install "duniter-keypair@$VER_KEYPAIR" --save --production +node/bin/npm install "duniter-prover@$VER_PROVER" --save --production +node/bin/npm install "duniter-ui@$VER_UI" --production --save # Clean unused UI modules rm -Rf node_modules/duniter-ui/node_modules diff --git a/release/arch/debian/build-deb.sh b/release/arch/debian/build-deb.sh index ebc1a54b8..f230ae209 100644 --- a/release/arch/debian/build-deb.sh +++ b/release/arch/debian/build-deb.sh @@ -4,6 +4,12 @@ export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm +VER_UI=1.1.5 +VER_BMA=1.1.2 +VER_CRAWLER=1.1.4 +VER_PROVER=1.1.2 +VER_KEYPAIR=1.1.3 + # Prepare NVER=`node -v` DUNITER_TAG= @@ -83,7 +89,7 @@ rm -Rf .git [[ $? -eq 0 ]] && echo ">> VM: removing duniter dev modules..." yarn remove duniter-bma duniter-crawler duniter-keypair duniter-prover --save [[ $? -eq 0 ]] && echo ">> VM: adding duniter modules..." -yarn add duniter-ui duniter-bma duniter-crawler duniter-keypair duniter-prover --save --production +yarn add "duniter-ui@$VER_UI" "duniter-bma@$VER_BMA" "duniter-crawler@$VER_CRAWLER" "duniter-keypair@$VER_KEYPAIR" "duniter-prover@$VER_PROVER" --save --production rm -rf node_modules yarn.lock yarn --production diff --git a/release/arch/windows/build.bat b/release/arch/windows/build.bat index 1c69eb24b..f519fd6fa 100644 --- a/release/arch/windows/build.bat +++ b/release/arch/windows/build.bat @@ -1,3 +1,10 @@ + +set VER_UI=1.1.5 +set VER_BMA=1.1.2 +set VER_CRAWLER=1.1.4 +set VER_PROVER=1.1.2 +set VER_KEYPAIR=1.1.3 + set ADDON_VERSION=48 set NW_VERSION=0.17.6 set NW_RELEASE=v0.17.6 @@ -34,13 +41,13 @@ REM call npm test echo "Retrait des modules 'dev'..." call npm prune --production echo "Ajout du module 1/4..." -call npm install duniter-bma --save --production +call npm install duniter-bma@%VER_BMA% --save --production echo "Ajout du module 2/4..." -call npm install duniter-crawler --save --production +call npm install duniter-crawler@%VER_CRAWLER% --save --production echo "Ajout du module 3/4..." -call npm install duniter-keypair --save --production +call npm install duniter-keypair@%VER_KEYPAIR% --save --production echo "Ajout du module 4/4..." -call npm install duniter-prover --save --production +call npm install duniter-prover@%VER_PROVER% --save --production set SRC=%cd% echo %SRC% cd node_modules/wotb @@ -67,7 +74,7 @@ cd ../heapdump call nw-gyp --target=%NW_VERSION% --msvs_version=2015 configure call nw-gyp --target=%NW_VERSION% --msvs_version=2015 build cd ../.. -call npm install duniter-ui --save --production +call npm install duniter-ui@%VER_UI% --save --production rd /s /q %cd%\node_modules\duniter-ui\node_modules cd .. mkdir duniter_release -- GitLab