From 302426c543ded3e6626edcb10b7e20fda9ae1bd1 Mon Sep 17 00:00:00 2001
From: librelois <elois@ifee.fr>
Date: Tue, 31 Mar 2020 02:21:47 +0200
Subject: [PATCH] [build] add rust & force node version to 10.19.0
---
.gitlab-ci.yml | 6 ++++--
release/arch/arm/build-arm.sh | 4 +++-
release/arch/linux/build-lin.sh | 10 ++++++----
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b3dcd0068..b1b44ea8c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,8 +28,10 @@ stages:
before_script:
- export NVM_DIR="$HOME/.nvm"
- . "$NVM_DIR/nvm.sh"
- - nvm install 10
- - nvm use 10
+ - nvm install 10.19.0
+ - nvm use 10.19.0
+ - curl https://sh.rustup.rs -sSf | sh -s -- -y
+ - export PATH="$HOME/.cargo/bin:$PATH"
.cached_nvm: &cached_nvm
<<: *nvm_env
diff --git a/release/arch/arm/build-arm.sh b/release/arch/arm/build-arm.sh
index 1862bb67f..2fd490967 100755
--- a/release/arch/arm/build-arm.sh
+++ b/release/arch/arm/build-arm.sh
@@ -6,7 +6,7 @@ export NVM_DIR="$HOME/.nvm"
# Prepare
-NODE_VERSION=10.11.0
+NODE_VERSION=10.19.0
ARCH="`uname -m | sed -e \"s/86_//\"`"
NVER="v$NODE_VERSION"
DUNITER_TAG=$1
@@ -19,6 +19,8 @@ RELEASES="$ROOT/releases"
nvm install ${NODE_VERSION}
nvm use ${NODE_VERSION}
+curl https://sh.rustup.rs -sSf | sh -s -- -y
+export PATH="$HOME/.cargo/bin:$PATH"
echo "Version de NodeJS : `node -v`"
diff --git a/release/arch/linux/build-lin.sh b/release/arch/linux/build-lin.sh
index ba27350ba..e62e05d3a 100644
--- a/release/arch/linux/build-lin.sh
+++ b/release/arch/linux/build-lin.sh
@@ -118,11 +118,11 @@ build_deb_pack() {
create_desc "${BIN}/duniter-${1}-${DUNITER_TAG}-linux-x64.deb" "${1}" "Linux (Ubuntu/Debian)"
}
-# -----------
-# Prepare
-# -----------
+# ------------------------------
+# Install tools needed to build
+# -----------------------------
-NODE_VERSION=10.11.0
+NODE_VERSION=10.19.0
NVER="v${NODE_VERSION}"
DUNITER_TAG="v${1}"
DUNITER_DEB_VER=" ${1}"
@@ -137,6 +137,8 @@ nvm install ${NVER} || exit 1
nvm use ${NVER} || exit 1
npm install -g node-pre-gyp || exit 1
npm install -g nw-gyp || exit 1
+curl https://sh.rustup.rs -sSf | sh -s -- -y
+export PATH="$HOME/.cargo/bin:$PATH"
# -----------
# Folders
--
GitLab