From 112ccd44474d66e0c202d37f60c63afd4437aea1 Mon Sep 17 00:00:00 2001
From: librelois <elois@ifee.fr>
Date: Sat, 2 May 2020 01:50:15 +0200
Subject: [PATCH] [build] update build scripts to compile rust in release mode
only
---
neon/build.sh | 2 +-
package.json | 4 ++--
release/arch/arm/build-arm.sh | 7 +++++--
release/arch/linux/build-lin.sh | 6 ++----
release/docker/Dockerfile | 3 ++-
5 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/neon/build.sh b/neon/build.sh
index a4553e728..105a7a505 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 bb61389a3..a82970f30 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 5fe1f1f21..70703f17e 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 b42b3dc04..8af3343cd 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 40d5c4904..974b0e3ff 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 && \
--
GitLab