[tor-commits] [tor-browser-build/master] Bug 40126: Bump Node to 10.22.1 for mozilla83

[sysrqb at torproject.org]

commit 1810b4bbf66b8a8516fa4c27364adc830c341616
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Oct 23 07:36:14 2020 +0000

    Bug 40126: Bump Node to 10.22.1 for mozilla83
    
    We adapt the download path, too, to the one Mozilla is using.
---
 projects/node/build  |  2 +-
 projects/node/config | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/projects/node/build b/projects/node/build
index 8cc8ea5..4a437be 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-[% c('version') %]
+cd node-v[% c('version') %]
 
 ./configure --prefix=$distdir
 make -j[% c("buildconf/num_procs") %]
diff --git a/projects/node/config b/projects/node/config
index b3534f4..55f8965 100644
--- a/projects/node/config
+++ b/projects/node/config
@@ -1,10 +1,18 @@
 # vim: filetype=yaml sw=2
-version: v10.21.0
+version: '[% c("var/node_version") %]'
 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
@@ -13,6 +21,6 @@ input_files:
   - project: '[% c("var/compiler") %]'
     name: '[% c("var/compiler") %]'
     enable: '[% c("var/linux") %]'
-  - URL: 'https://nodejs.org/download/release/[% c("version") %]/node-[% c("version") %].tar.xz'
-    sha256sum: 26b01fa28338cacaa8a66d7963ab2514e81678c268ab52ec55dcf937aadcb73b
+  - URL: 'https://nodejs.org/dist/v[% c("var/node_version") %]/node-v[% c("var/node_version") %].tar.xz'
+    sha256sum: '[% c("var/node_hash") %]'
     name: node