mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1762571 - Upgrade NodeJS to v12 for the build system and v16 for tests. r=firefox-build-system-reviewers,glandium 

Differential Revision: https://phabricator.services.mozilla.com/D147173
This commit is contained in:
Mark Banner 2022-07-07 22:08:59 +00:00
Родитель ab82e73786
Коммит fbbe33b4ea
10 изменённых файлов: 31 добавлений и 106 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
python/mozbuild/mozbuild/nodeutil.py
Просмотреть файл

@ -13,8 +13,8 @@ from mozboot.util import get_tools_dir
from mozfile import which
from six import PY3
NODE_MIN_VERSION = StrictVersion("10.23.1")
NPM_MIN_VERSION = StrictVersion("6.14.10")
NODE_MIN_VERSION = StrictVersion("12.22.1")
NPM_MIN_VERSION = StrictVersion("6.14.12")
def find_node_paths():

8
taskcluster/ci/build/linux-base-toolchains.yml
Просмотреть файл

@ -43,7 +43,7 @@ linux64-base-toolchains/opt:
- linux64-dump_syms
- linux64-sccache
- linux64-nasm-2.14.02
- linux64-node-10
- linux64-node-12
- sysroot-x86_64-linux-gnu
linux64-base-toolchains/debug:
@ -83,7 +83,7 @@ linux64-base-toolchains/debug:
- linux64-dump_syms
- linux64-sccache
- linux64-nasm-2.14.02
- linux64-node-10
- linux64-node-12
- sysroot-x86_64-linux-gnu
linux64-base-toolchains-clang/opt:
@ -118,7 +118,7 @@ linux64-base-toolchains-clang/opt:
- linux64-cbindgen
- linux64-dump_syms
- linux64-nasm-2.14.02
- linux64-node-10
- linux64-node-12
- sysroot-x86_64-linux-gnu
linux64-base-toolchains-clang/debug:
@ -156,5 +156,5 @@ linux64-base-toolchains-clang/debug:
- linux64-cbindgen
- linux64-dump_syms
- linux64-nasm-2.14.02
- linux64-node-10
- linux64-node-12
- sysroot-x86_64-linux-gnu

44
taskcluster/ci/fetch/toolchains.yml
Просмотреть файл

@ -474,17 +474,6 @@ makecab:
repo: https://github.com/glandium/rust-makecab/
revision: 73a4605b97123bf7221533c671f27f234d974b02
nodejs-10-linux64:
description: nodejs 10 for x64 linux
fetch:
type: static-url
url: https://nodejs.org/dist/v10.23.1/node-v10.23.1-linux-x64.tar.xz
sha256: 207e5ec77ca655ba6fcde922d6b329acbb09898b0bd793ccfcce6c27a36fdff0
size: 13139076
artifact-name: nodejs.tar.zst
strip-components: 1
add-prefix: node/
nodejs-12-linux64:
description: nodejs 12 for x64 linux
fetch:
@ -507,17 +496,6 @@ nodejs-16-linux64:
strip-components: 1
add-prefix: node/
nodejs-10-macosx64:
description: nodejs 10 for x64 macOS
fetch:
type: static-url
url: https://nodejs.org/dist/v10.23.1/node-v10.23.1-darwin-x64.tar.xz
sha256: febfdabd98ab5b8f8fdff32ab8c111d834083805bf042ab65c923cc22609c99d
size: 12233276
artifact-name: nodejs.tar.zst
strip-components: 1
add-prefix: node/
nodejs-12-macosx64:
description: nodejs 12 for x64 macOS
fetch:
@ -551,17 +529,6 @@ nodejs-16-macosx64-arm64:
strip-components: 1
add-prefix: node/
nodejs-10-win32:
description: nodejs 10 for x86 Windows
fetch:
type: static-url
url: https://nodejs.org/dist/v10.23.1/node-v10.23.1-win-x86.zip
sha256: c3be0fd50c218cc52e85377c9e22d7d2110d72de95bdbc9447145b246330f818
size: 16806899
artifact-name: nodejs.tar.zst
strip-components: 1
add-prefix: node/
nodejs-12-win32:
description: nodejs 12 for x86 Windows
fetch:
@ -584,17 +551,6 @@ nodejs-16-win32:
strip-components: 1
add-prefix: node/
nodejs-10-win64:
description: nodejs 10 for x64 Windows
fetch:
type: static-url
url: https://nodejs.org/dist/v10.23.1/node-v10.23.1-win-x64.zip
sha256: 497996aa1037b6f7f492c1d275bb90140269223939525286b4e95babad16f0de
size: 18307638
artifact-name: nodejs.tar.zst
strip-components: 1
add-prefix: node/
nodejs-12-win64:
description: nodejs 12 for x64 Windows
fetch:

2
taskcluster/ci/perftest/android.yml
Просмотреть файл

@ -6,7 +6,7 @@
job-defaults:
fetches:
toolchain:
- linux64-node-12
- linux64-node
- linux64-geckodriver
run:
sparse-profile: perftest

2
taskcluster/ci/perftest/linux.yml
Просмотреть файл

@ -6,7 +6,7 @@ job-defaults:
worker-type: t-linux-talos-1804
fetches:
toolchain:
- linux64-node-12
- linux64-node
- linux64-geckodriver
build:
- artifact: target.mozinfo.json

2
taskcluster/ci/perftest/windows.yml
Просмотреть файл

@ -9,7 +9,7 @@ job-defaults:
- artifact: target.perftests.tests.tar.gz
- artifact: target.zip
toolchain:
- win64-node-12
- win64-node
- win64-geckodriver
platform: windows10-64-shippable/opt
require-build:

16
taskcluster/ci/source-test/python.yml
Просмотреть файл

@ -412,11 +412,11 @@ mozperftest:
toolchain:
by-platform:
linux1804-64/opt:
- linux64-node-12
- linux64-node
macosx1015-64/opt:
- macosx64-node-12
- macosx64-node
windows10-64/opt:
- win64-node-12
- win64-node
when:
files-changed:
- 'testing/performance/**'
@ -469,9 +469,9 @@ featuregates:
toolchain:
by-platform:
linux1804-64/opt:
- linux64-node-12
- linux64-node
windows10-64/opt:
- win64-node-12
- win64-node
when:
files-changed:
- 'toolkit/components/featuregates/**'
@ -544,11 +544,11 @@ telemetry-python:
toolchain:
by-platform:
linux1804-64/opt:
- linux64-node-12
- linux64-node
macosx1015-64/opt:
- macosx64-node-12
- macosx64-node
windows10-64/opt:
- win64-node-12
- win64-node
when:
files-changed:
- 'toolkit/components/telemetry/**'

51
taskcluster/ci/toolchain/node.yml
Просмотреть файл

@ -13,19 +13,9 @@ job-defaults:
script: repack-node.sh
toolchain-artifact: public/build/node.tar.zst
linux64-node-10:
treeherder:
symbol: TL(node-10)
fetches:
fetch:
- nodejs-10-linux64
linux64-node-12:
treeherder:
symbol: TL(node-12)
run:
toolchain-alias: linux64-node
fetches:
fetch:
- nodejs-12-linux64
@ -33,23 +23,16 @@ linux64-node-12:
linux64-node-16:
treeherder:
symbol: TL(node-16)
run:
toolchain-alias:
- linux64-node
fetches:
fetch:
- nodejs-16-linux64
macosx64-node-10:
treeherder:
symbol: TM(node-10)
fetches:
fetch:
- nodejs-10-macosx64
macosx64-node-12:
treeherder:
symbol: TM(node-12)
run:
toolchain-alias:
- macosx64-node
fetches:
fetch:
- nodejs-12-macosx64
@ -57,6 +40,9 @@ macosx64-node-12:
macosx64-node-16:
treeherder:
symbol: TM(node-16)
run:
toolchain-alias:
- macosx64-node
fetches:
fetch:
- nodejs-16-macosx64
@ -71,18 +57,9 @@ macosx64-aarch64-node-16:
fetch:
- nodejs-16-macosx64-arm64
win64-node-10:
treeherder:
symbol: TW64(node-10)
fetches:
fetch:
- nodejs-10-win64
win64-node-12:
treeherder:
symbol: TW64(node-12)
run:
toolchain-alias: win64-node
fetches:
fetch:
- nodejs-12-win64
@ -90,24 +67,16 @@ win64-node-12:
win64-node-16:
treeherder:
symbol: TW64(node-16)
run:
toolchain-alias:
- win64-node
fetches:
fetch:
- nodejs-16-win64
win32-node-10:
treeherder:
symbol: TW32(node-10)
fetches:
fetch:
- nodejs-10-win32
win32-node-12:
treeherder:
symbol: TW32(node-12)
run:
toolchain-alias:
- win32-node
- win64-aarch64-node
fetches:
fetch:
- nodejs-12-win32
@ -117,7 +86,7 @@ win32-node-16:
symbol: TW32(node-16)
run:
toolchain-alias:
- win64-aarch64-node-16
- win32-node
fetches:
fetch:
- nodejs-16-win32

2
taskcluster/docker/lint/system-setup.sh
Просмотреть файл

@ -46,7 +46,7 @@ cd /build
# shellcheck disable=SC1091
. install-node.sh
npm install -g yarn@1.9.4
npm install -g yarn@1.22.18
/build/tooltool.py fetch -m /tmp/eslint.tt
mv /build/node_modules /build/node_modules_eslint

6
taskcluster/docker/recipes/install-node.sh
Просмотреть файл

@ -3,13 +3,13 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# This script installs Node v12.
# This script installs Node v16.
# XXX For now, this should match the version installed in
# taskcluster/scripts/misc/repack-node.sh. Later we'll get the ESLint builder
# to use the linux64-node toolchain directly.
wget -O node.xz --progress=dot:mega https://nodejs.org/download/release/v12.22.1/node-v12.22.1-linux-x64.tar.xz
echo '8b537282c222ae4a40e019a52f769ca27b6640699bdde1510375e8d72da7d041' node.xz | sha256sum -c
wget -O node.xz --progress=dot:mega https://nodejs.org/download/release/v16.14.2/node-v16.14.2-linux-x64.tar.xz
echo 'e40c6f81bfd078976d85296b5e657be19e06862497741ad82902d0704b34bb1b' node.xz | sha256sum -c
tar -C /usr/local -xJ --strip-components 1 < node.xz
node -v # verify
npm -v