*: use latest LTS node

epfml · Mar 25, 2024 · 36dff42 · 36dff42
1 parent 1c0e914
commit 36dff42
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 79 deletions.
diff --git a/.github/workflows/deploy-server.yml b/.github/workflows/deploy-server.yml
@@ -6,7 +6,6 @@ on:
     types: [completed]
 
 env:
-  node_version: 16
   server_url: https://deai-313515.ew.r.appspot.com/
 
 jobs:
@@ -20,7 +19,7 @@ jobs:
           ref: production
       - uses: actions/setup-node@v3
         with:
-          node-version: ${{ env.node_version }}
+          node-version-file: .nvmrc
           cache: npm
           cache-dependency-path: |
             discojs/package-lock.json

diff --git a/.github/workflows/github-pages.yml b/.github/workflows/github-pages.yml
@@ -5,17 +5,14 @@ on:
     branches: [production]
     types: [completed]
 
-env:
-  node_version: 16
-
 jobs:
   gh-pages-build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: ${{ env.node_version }}
+          node-version-file: .nvmrc
           cache: npm
           cache-dependency-path: |
             discojs/package-lock.json
@@ -30,15 +27,15 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v1
         with:
-          path: './web-client/dist'
-          
+          path: "./web-client/dist"
+
   gh-pages-deploy:
     needs: gh-pages-build
 
     # Grant GITHUB_TOKEN the permissions required to make a Pages deployment
     permissions:
-      pages: write      # to deploy to Pages
-      id-token: write   # to verify the deployment originates from an appropriate source
+      pages: write # to deploy to Pages
+      id-token: write # to verify the deployment originates from an appropriate source
 
     # Deploy to the github-pages environment
     environment:

diff --git a/.github/workflows/lint-test-build.yml b/.github/workflows/lint-test-build.yml
@@ -4,9 +4,6 @@ on:
     branches: production
   pull_request:
 
-env:
-  node_version: 16
-
 jobs:
   download-datasets:
     runs-on: ubuntu-latest
@@ -28,7 +25,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: ${{ env.node_version }}
+          node-version-file: .nvmrc
           cache: npm
       - run: npm ci
       - run: npm --workspace=./discojs/discojs-{core,node} run build
@@ -41,7 +38,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: ${{ env.node_version }}
+          node-version-file: .nvmrc
           cache: npm
       - run: npm ci
       - run: npm --workspace=./discojs/discojs-core run build
@@ -54,7 +51,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: ${{ env.node_version }}
+          node-version-file: .nvmrc
           cache: npm
       - run: npm ci
       - run: npm --workspace=./discojs/discojs-core run build
@@ -67,7 +64,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: ${{ env.node_version }}
+          node-version-file: .nvmrc
           cache: npm
       - run: npm ci
       - run: npm --workspace=./discojs/discojs-{core,node} run build
@@ -80,7 +77,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: ${{ env.node_version }}
+          node-version-file: .nvmrc
           cache: npm
       - run: npm ci
       - run: npm --workspace={./discojs/discojs-{core,node},./server} run build
@@ -93,7 +90,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: ${{ env.node_version }}
+          node-version-file: .nvmrc
           cache: npm
       - run: npm ci
       - run: npm --workspace=./discojs/discojs-{core,web} run build
@@ -106,7 +103,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: ${{ env.node_version }}
+          node-version-file: .nvmrc
           cache: npm
       - run: npm ci
       - run: npm --workspace={./discojs/discojs-{core,node},./server} run build
@@ -119,7 +116,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: ${{ env.node_version }}
+          node-version-file: .nvmrc
           cache: npm
       - run: npm ci
       - run: npm --workspace=./discojs/discojs-core run build
@@ -131,7 +128,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: ${{ env.node_version }}
+          node-version-file: .nvmrc
           cache: npm
       - run: npm ci
       - run: npm --workspace=./discojs/discojs-core run build
@@ -144,7 +141,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: ${{ env.node_version }}
+          node-version-file: .nvmrc
           cache: npm
       - run: npm ci
       - run: npm run --workspace=./discojs/discojs-core build
@@ -157,7 +154,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: ${{ env.node_version }}
+          node-version-file: .nvmrc
           cache: npm
       - run: npm ci
       - run: npm run --workspace=./discojs/discojs-{core,node} build
@@ -180,7 +177,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: ${{ env.node_version }}
+          node-version-file: .nvmrc
           cache: npm
       - run: npm ci
       - run: npm run --workspace={./discojs/discojs-{core,node},./server} build
@@ -193,7 +190,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: ${{ env.node_version }}
+          node-version-file: .nvmrc
           cache: npm
       - run: npm ci
       - run: npm --workspace=./discojs/discojs-{core,web} run build
@@ -206,7 +203,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: ${{ env.node_version }}
+          node-version-file: .nvmrc
           cache: npm
       - run: npm ci
       - run: npm --workspace={./discojs/discojs-{core,node},./server} run build
@@ -228,7 +225,7 @@ jobs:
           key: datasets-${{ hashFiles('datasets/**') }}
       - uses: actions/setup-node@v3
         with:
-          node-version: ${{ env.node_version }}
+          node-version-file: .nvmrc
           cache: npm
       - run: npm ci
       - run: npm --workspace=./discojs/discojs-{core,node} run build
@@ -248,7 +245,7 @@ jobs:
           key: datasets-${{ hashFiles('datasets/**') }}
       - uses: actions/setup-node@v3
         with:
-          node-version: ${{ env.node_version }}
+          node-version-file: .nvmrc
           cache: npm
       - run: npm ci
       - run: npm --workspace=./discojs/discojs-core run build
@@ -268,7 +265,7 @@ jobs:
           key: datasets-${{ hashFiles('datasets/**') }}
       - uses: actions/setup-node@v3
         with:
-          node-version: ${{ env.node_version }}
+          node-version-file: .nvmrc
           cache: npm
       - run: npm ci
       - run: npm --workspace=./discojs/discojs-core run build
@@ -288,7 +285,7 @@ jobs:
           key: datasets-${{ hashFiles('datasets/**') }}
       - uses: actions/setup-node@v3
         with:
-          node-version: ${{ env.node_version }}
+          node-version-file: .nvmrc
           cache: npm
       - run: npm ci
       - run: npm --workspace=./discojs/discojs-{core,node} run build
@@ -308,7 +305,7 @@ jobs:
           key: datasets-${{ hashFiles('datasets/**') }}
       - uses: actions/setup-node@v3
         with:
-          node-version: ${{ env.node_version }}
+          node-version-file: .nvmrc
           cache: npm
       - run: npm ci
       - run: npm --workspace=./discojs/discojs-{core,web} run build
@@ -335,7 +332,7 @@ jobs:
           key: datasets-${{ hashFiles('datasets/**') }}
       - uses: actions/setup-node@v3
         with:
-          node-version: ${{ env.node_version }}
+          node-version-file: .nvmrc
           cache: npm
       - run: npm ci
       - run: npm --workspace={./discojs/discojs-{core,node},./server} run build
@@ -355,7 +352,7 @@ jobs:
           key: datasets-${{ hashFiles('datasets/**') }}
       - uses: actions/setup-node@v3
         with:
-          node-version: ${{ env.node_version }}
+          node-version-file: .nvmrc
           cache: npm
       - run: npm ci
       - run: npm --workspace={./discojs/discojs-{core,node},./server} run build

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -7,18 +7,14 @@ on:
         required: true
         type: string
 
-env:
-  node_version: 16
-
 jobs:
-
   publish-and-tag:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: ${{ env.node_version }}
+          node-version-file: .nvmrc
           registry-url: https://registry.npmjs.org
           cache: npm
           cache-dependency-path: |

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v16
+v20
diff --git a/DEV.md b/DEV.md
@@ -44,49 +44,38 @@ flowchart LR
 
 The following instructions will install the required dependencies, build Disco.js and launch a DISCO server and a web client. If you run into any sort of trouble check our [FAQ](./docs/FAQ.md); otherwise please create a new issue or feel free to ask on [our slack](https://join.slack.com/t/disco-decentralized/shared_invite/zt-fpsb7c9h-1M9hnbaSonZ7lAgJRTyNsw).
 
-**1.** We recommend using [nvm](https://github.com/nvm-sh/nvm) (Node Version Manager) to handle multiple Node.js versions. Start by installing `nvm` by following [their installation instructions](https://github.com/nvm-sh/nvm).
-After installation, you should be able to run
+**1.** Clone the repository
 
 ```
-nvm -v
-0.39.7 # my nvm version at the time
+git clone [email protected]:epfml/disco.git
+cd disco
 ```
 
-**2.** Install Node.js version 16
+**2.** Install Node.js
 
-```
-nvm install 16
-```
-
-You can now choose which Node.js version to use:
+We recommend using [nvm](https://github.com/nvm-sh/nvm) (Node Version Manager) to handle multiple Node.js versions. Start by installing `nvm` by following [their installation instructions](https://github.com/nvm-sh/nvm).
+After installation, you should be able to run
 
 ```
-nvm use 16
+nvm -v
+0.39.7 # at the time of writing
 ```
 
-Using Node.js v16 should automatically set your [npm](https://docs.npmjs.com/about-npm) (Node Package Manager, different from n**v**m) version to 8:
+Use it to install the version we use in DISCO.
 
 ```
-npm --version
-8.xx.xx
+nvm install # it reads `.nvmrc` to select the correct version
 ```
 
 `nvm` manages your different Node.js versions while `npm` handles your different Node.js project packages within one version.
 
-**3.** Clone the repository
-
-```
-git clone [email protected]:epfml/disco.git
-cd disco
-```
-
-**4.** Install the dependencies
+**3.** Install the dependencies
 
 ```
 npm ci
 ```
 
-**5.** Build the projects
+**4.** Build the projects
 
 Then we need to builds the packages meaning compile TypeScript into JavaScript.
 
@@ -98,13 +87,13 @@ Or you can select a specific workspace via `--workspace=$name-or-path-to-package
 npm -ws run build
 ```
 
-**6.** Download and extract the sample training datasets. These datasets are used in the automated tests.
+**5.** Download and extract the sample training datasets. These datasets are used in the automated tests.
 
 ```
 ./datasets/populate
 ```
 
-**7.** Launch DISCO
+**6.** Launch DISCO
 
 As you may have seen, there are many ways to use DISCO. Here we will run a server and a web client. From there, a user can use DISCO from their browser.
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,17 +1,4 @@
-# syntax=docker/dockerfile:1
-
-FROM ubuntu:20.04
-
-ENV NODE_ENV=development
-
-RUN apt-get upgrade -y \
-    && apt-get update -y \
-    && apt-get install -y libnode-dev \
-    && apt-get install -y python3.8 \
-    && apt install -y build-essential \
-    && apt-get install -y curl \
-    && curl --silent --location https://deb.nodesource.com/setup_16.x | bash - \
-    && apt install -y nodejs 
+FROM node:20
 
 COPY package*.json .
 COPY isomorphic-wrtc/package.json isomorphic-wrtc/