diff --git a/neon/build.sh b/neon/build.sh index a4553e72877809f259ff850bc1d94e678bad843b..105a7a50505a175fd1ea8d587f0f768e4483879a 100755 --- a/neon/build.sh +++ b/neon/build.sh @@ -2,7 +2,7 @@ cd neon -if [ "${NODE_ENV}" = "production" ] +if [ "${NEON_BUILD_RELEASE}" = "true" ] || [ "${NODE_ENV}" = "production" ] then neon build --release else diff --git a/package.json b/package.json index bb61389a3fe0445949d1cb5d7563c191643771b9..a82970f304ab344f942e5f9ee5e6cb04a11c1ed8 100644 --- a/package.json +++ b/package.json @@ -119,11 +119,11 @@ "@types/node": "13.9.8", "@types/should": "8.3.0", "@types/ws": "^5.1.2", - "husky": ">=4", - "lint-staged": ">=10", "coveralls": "3.0.11", "eslint": "6.8.0", "eslint-plugin-mocha": "6.3.0", + "husky": ">=4", + "lint-staged": ">=10", "mocha": "3.4.2", "mocha-eslint": "0.1.7", "nyc": "^11.0.3", diff --git a/release/arch/arm/build-arm.sh b/release/arch/arm/build-arm.sh index 5fe1f1f2178c839ecda63bb11d14f219ce5c4233..70703f17e9c28d388ef6a143e4af68bf9fd7d566 100755 --- a/release/arch/arm/build-arm.sh +++ b/release/arch/arm/build-arm.sh @@ -68,9 +68,12 @@ cd ${RELEASES}/duniter echo "Copying Nodejs" cp -R "$DOWNLOADS/node-${NVER}-linux-${ARCH}" node -yarn +# Build Duniter with GUI +echo "Build Duniter with GUI..." +export NEON_BUILD_RELEASE="true" +yarn add "duniter-ui@${DUNITER_UI_VER}" || exit 1 +yarn --production || exit 1 -yarn add duniter-ui@1.7.x --production SRC=`pwd` echo $SRC diff --git a/release/arch/linux/build-lin.sh b/release/arch/linux/build-lin.sh index b42b3dc04961d9b1c9f93a838dff9870e8fba989..8af3343cdb66b51c07ae84384d0a6c5f1d3a1e05 100644 --- a/release/arch/linux/build-lin.sh +++ b/release/arch/linux/build-lin.sh @@ -176,11 +176,9 @@ cp -r $(find "${ROOT}" -mindepth 1 -maxdepth 1 ! -name "${WORK_NAME}") "${RELEAS cd "${RELEASES}/duniter" rm -Rf .gitignore .git || exit 1 # Remove git files -# Build +# Build Duniter with GUI echo ">> VM: building modules..." -yarn || exit 1 - -# Duniter UI +export NEON_BUILD_RELEASE="true" yarn add "duniter-ui@${DUNITER_UI_VER}" || exit 1 yarn --production || exit 1 diff --git a/release/docker/Dockerfile b/release/docker/Dockerfile index 40d5c49049d44ef495f2ac39256293fc174ab0d9..974b0e3ff94586e6f361ed53bfc0470aa552b226 100644 --- a/release/docker/Dockerfile +++ b/release/docker/Dockerfile @@ -24,8 +24,9 @@ RUN curl https://sh.rustup.rs -sSf | sh -s -- -y # build duniter RUN export PATH="$HOME/.cargo/bin:$PATH" && \ export RUSTFLAGS="-C target-feature=-crt-static" && \ - yarn install --production && \ + export NEON_BUILD_RELEASE="true" && \ yarn add duniter-ui@${DUNITER_UI_VER} && \ + yarn --production && \ mv release/docker/duniter.sh docker.sh && \ rm -rf coverage release test && \ rm -rf target && \