commit 78030f34ddfa43c286e3b484bd87460655b3756e Author: Georg Koppen gk@torproject.org Date: Tue Nov 10 08:43:55 2020 +0000

Revert "Bug 40126: Bump Node to 10.22.1 for mozilla83"

This reverts commit 1810b4bbf66b8a8516fa4c27364adc830c341616. --- projects/node/build | 2 +- projects/node/config | 14 +++----------- 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/projects/node/build b/projects/node/build index 4a437be..8cc8ea5 100644 --- a/projects/node/build +++ b/projects/node/build @@ -11,7 +11,7 @@ [% END -%] distdir=/var/tmp/dist/[% project %] tar -xf [% c('input_files_by_name/node') %] -cd node-v[% c('version') %] +cd node-[% c('version') %]

./configure --prefix=$distdir make -j[% c("buildconf/num_procs") %] diff --git a/projects/node/config b/projects/node/config index 55f8965..b3534f4 100644 --- a/projects/node/config +++ b/projects/node/config @@ -1,18 +1,10 @@ # vim: filetype=yaml sw=2 -version: '[% c("var/node_version") %]' +version: v10.21.0 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: - node_version: 10.21.0 - node_hash: 26b01fa28338cacaa8a66d7963ab2514e81678c268ab52ec55dcf937aadcb73b container: use_container: 1

-targets: - android: - var: - node_version: 10.22.1 - node_hash: f47f4725dcae137b26f8e2a7d0ab2c2c7f1f47e4f96834e6a9242f157132255f - input_files: - project: container-image - project: binutils @@ -21,6 +13,6 @@ input_files: - project: '[% c("var/compiler") %]' name: '[% c("var/compiler") %]' enable: '[% c("var/linux") %]' - - URL: 'https://nodejs.org/dist/v%5B% c("var/node_version") %]/node-v[% c("var/node_version") %].tar.xz' - sha256sum: '[% c("var/node_hash") %]' + - URL: 'https://nodejs.org/download/release/%5B% c("version") %]/node-[% c("version") %].tar.xz' + sha256sum: 26b01fa28338cacaa8a66d7963ab2514e81678c268ab52ec55dcf937aadcb73b name: node