diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c9d176599efd01d4cbe29696ab7f3a9b2fcc5bb1..ec02586f968b07b9449ae52ca7de5570265e7203 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,14 +22,14 @@ workflow: - server.ts .env: &env - image: registry.duniter.org/docker/duniter-ci:v0.0.4 + image: registry.duniter.org/docker/duniter-ci:v0.2.0 tags: - redshift before_script: - export NVM_DIR="$HOME/.nvm" - . "$NVM_DIR/nvm.sh" - - nvm install 10 - - nvm use 10 + - nvm install 20.2.0 + - nvm use 20.2.0 - export RUSTFLAGS="-D warnings" diff --git a/doc/dev/setup_env_dev.md b/doc/dev/setup_env_dev.md index 34815cd4ddfa7f3380b6b39d59227b0c9e79afeb..4ef59d0e2e7fa04bd20c871757b08cf8800e418c 100644 --- a/doc/dev/setup_env_dev.md +++ b/doc/dev/setup_env_dev.md @@ -35,9 +35,9 @@ Nvm: Check the required node version in the `package.json` file on line 5. -If, for example, version 10 is expected, install and select it with the following command: +If, for example, version 20 is expected, install and select it with the following command: - nvm install 10 && nvm use 10 + nvm install 20 && nvm use 20 ### Build the project and play automated tests diff --git a/doc/use/manual_compilation.md b/doc/use/manual_compilation.md index e3be4c9aa420cf7a3b6b5bb7fb1c69a528b92ce0..3c14c3d352feffa97418065022e922b3129fb7d3 100644 --- a/doc/use/manual_compilation.md +++ b/doc/use/manual_compilation.md @@ -74,9 +74,9 @@ Go to the root of the folder where you extracted the source code (or possibly cl Check the required node version in the `package.json` file on line 5. -If, for example, version 10 is expected, install and select it with the following command: +If, for example, version 20 is expected, install and select it with the following command: - nvm install 10 && nvm use 10 + nvm install 20 && nvm use 20 ### Optionally add GUI diff --git a/neon/README.md b/neon/README.md index 8c2bf9e9143880cfb8a1e554ff028893127eaba4..14bab656a44e1783f0fa52d8ac3a7b1ad0647424 100644 --- a/neon/README.md +++ b/neon/README.md @@ -15,13 +15,13 @@ You'll need nvm and rust: - [nvm install instructions](https://github.com/nvm-sh/nvm#installing-and-updating) - [rust install instructions](https://www.rust-lang.org/learn/get-started) -Once these tools are installed, use nvm to install node 10: +Once these tools are installed, use nvm to install node 20: - nvm install 10 + nvm install 20 Finally, before each work session on Duniteroxide, select Node 10: - nvm use 10 + nvm use 20 ### Compile @@ -31,7 +31,7 @@ Run the following command at the root of the repository: npm install -###Â Test +### Test Run the following command at the root of the repository: diff --git a/release/arch/arm/build-arm.sh b/release/arch/arm/build-arm.sh index e00eb0199577bfabb48c2b09ccb3a6fa19c8e0c7..841e3048352cae95f511e5ff1e77191c814347f2 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.20.1 +NODE_VERSION=20.2.0 ARCH="`uname -m | sed -e \"s/86_//\"`" NVER="v$NODE_VERSION" DUNITER_TAG=$1 diff --git a/release/arch/linux/build-lin.sh b/release/arch/linux/build-lin.sh index 4078aad0bf0a8152a0edb2713b23a64d0c32b6a1..b88e1bad861c5066369a120cc959b9b7440f3335 100755 --- a/release/arch/linux/build-lin.sh +++ b/release/arch/linux/build-lin.sh @@ -79,7 +79,7 @@ build_deb_pack() { # Install tools needed to build # ----------------------------- -NODE_VERSION=10.20.1 +NODE_VERSION=20.2.0 NVER="v${NODE_VERSION}" DUNITER_TAG="v${1}" DUNITER_DEB_VER=" ${1}" diff --git a/release/arch/windows/build.bat b/release/arch/windows/build.bat index 89b38404b40b74fef0e19a3d7db66274dac227c1..960d9a30be43627c5db046b12b96283b7374d985 100644 --- a/release/arch/windows/build.bat +++ b/release/arch/windows/build.bat @@ -1,7 +1,7 @@ set ADDON_VERSION=64 -set NW_VERSION=0.33.1 -set NODEJS_VERSION=10.11.0 +set NW_VERSION=0.77.0 +set NODEJS_VERSION=20.2.0 set NW_RELEASE=v%NW_VERSION% set NW=nwjs-%NW_RELEASE%-win-x64 diff --git a/release/docker/Dockerfile b/release/docker/Dockerfile index f45486c7582e526d8c0137867b12d077c9b95c0e..3d947088ab508e402dc85d92638bd142f090c95b 100644 --- a/release/docker/Dockerfile +++ b/release/docker/Dockerfile @@ -2,7 +2,7 @@ # Build Stage # ------------------------------------------------------------------------------ -FROM node:10-alpine as build +FROM node:20-alpine as build LABEL maintainer="elois <elois@duniter.org>" LABEL version="0.1.0" @@ -34,7 +34,7 @@ RUN PATH=${HOME}/.cargo/bin:${PATH} \ # Final Stage # ------------------------------------------------------------------------------ -FROM node:10-alpine +FROM node:20-alpine # create group and user duniter RUN addgroup -S -g 1111 duniter && \