From 13a608979c26bcf30d8ebbb08d69c411976599cd Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Fri, 4 Aug 2023 17:51:58 +0200
Subject: [PATCH] ci: nodejs is installed in build agents [skip ci]

---
 .github/workflows/insider-linux.yml | 16 ----------------
 .github/workflows/stable-linux.yml  | 16 ----------------
 docs/build.md                       | 27 ++++-----------------------
 3 files changed, 4 insertions(+), 55 deletions(-)

diff --git a/.github/workflows/insider-linux.yml b/.github/workflows/insider-linux.yml
index 9027ce2..4f798f0 100644
--- a/.github/workflows/insider-linux.yml
+++ b/.github/workflows/insider-linux.yml
@@ -89,14 +89,6 @@ jobs:
       - uses: docker/setup-qemu-action@v2
         if: matrix.vscode_arch == 'arm64' || matrix.vscode_arch == 'ppc64le'
 
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v3
-        with:
-          node-version: '16'
-
-      - name: Install Yarn
-        run: npm install -g yarn
-
       - name: Install remote dependencies
         run: ./install_remote_dependencies.sh
 
@@ -156,14 +148,6 @@ jobs:
       - name: Install GH
         run: ./install_gh.sh
 
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v3
-        with:
-          node-version: '16'
-
-      - name: Install Yarn
-        run: npm install -g yarn
-
       - name: Check existing VSCodium tags/releases
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/stable-linux.yml b/.github/workflows/stable-linux.yml
index 59b368e..8d1eb16 100644
--- a/.github/workflows/stable-linux.yml
+++ b/.github/workflows/stable-linux.yml
@@ -86,14 +86,6 @@ jobs:
       - uses: docker/setup-qemu-action@v2
         if: matrix.vscode_arch == 'arm64' || matrix.vscode_arch == 'ppc64le'
 
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v3
-        with:
-          node-version: '16'
-
-      - name: Install Yarn
-        run: npm install -g yarn
-
       - name: Install remote dependencies
         run: ./install_remote_dependencies.sh
 
@@ -151,14 +143,6 @@ jobs:
       - name: Install GH
         run: ./install_gh.sh
 
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v3
-        with:
-          node-version: '16'
-
-      - name: Install Yarn
-        run: npm install -g yarn
-
       - name: Check existing VSCodium tags/releases
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/docs/build.md b/docs/build.md
index 39e37de..25494e1 100644
--- a/docs/build.md
+++ b/docs/build.md
@@ -83,31 +83,20 @@ docker run -ti --volume=$(pwd):/root/vscodium --name=vscodium-build-agent vscodi
 
 When inside the container, you can use the following commands to build:
 ```
-curl -fsSL https://deb.nodesource.com/setup_16.x | sudo -E bash -
-sudo apt-get install -y nodejs desktop-file-utils
-
-npm install -g yarn
-
 cd /root/vscodium
 
-. get_repo.sh
-
-export SHOULD_BUILD=yes
-export OS_NAME=linux
-export VSCODE_ARCH=x64
-
-. build.sh
+./build/build.sh
 ```
 
 ### <a id="build-docker-arm32"></a>ARM 32bits
 
 Firstly, create the container with:
 ```
-docker run -ti --volume=<local vscodium source>:/root/vscodium --name=vscodium-build-agent vscodium/vscodium-linux-build-agent:stretch-armhf bash
+docker run -ti --volume=<local vscodium source>:/root/vscodium --name=vscodium-build-agent vscodium/vscodium-linux-build-agent:bionic-armhf bash
 ```
 like
 ```
-docker run -ti --volume=$(pwd):/root/vscodium --name=vscodium-build-agent vscodium/vscodium-linux-build-agent:stretch-armhf bash
+docker run -ti --volume=$(pwd):/root/vscodium --name=vscodium-build-agent vscodium/vscodium-linux-build-agent:bionic-armhf bash
 ```
 
 When inside the container, you can use the following commands to build:
@@ -117,15 +106,7 @@ sudo apt-get install -y nodejs desktop-file-utils
 
 cd /root/vscodium
 
-. get_repo.sh
-
-export SHOULD_BUILD=yes
-export OS_NAME=linux
-export VSCODE_ARCH=armhf
-export npm_config_arch=armv7l
-export npm_config_force_process_config="true"
-
-. build.sh
+./build/build.sh
 ```
 
 ## <a id="build-snap"></a>Build Snap