From b18675eae546f221871d53035f241a6b2c84d2b7 Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Mon, 13 Jan 2020 10:59:57 +0100 Subject: [PATCH] Switch to NodeJS v12 (LTS) for build --- taskcluster/.shared.yml | 1 + taskcluster/linux-amd64-cpu-opt.yml | 2 +- taskcluster/linux-amd64-ctc-opt.yml | 2 +- taskcluster/linux-amd64-gpu-opt.yml | 2 +- taskcluster/linux-amd64-tflite-opt.yml | 2 +- taskcluster/linux-arm64-cpu-opt.yml | 2 +- taskcluster/linux-rpi3-cpu-opt.yml | 2 +- taskcluster/node-package-cpu.yml | 2 +- taskcluster/node-package-gpu.yml | 2 +- 9 files changed, 9 insertions(+), 8 deletions(-) diff --git a/taskcluster/.shared.yml b/taskcluster/.shared.yml index b6f942ce..00fc663c 100644 --- a/taskcluster/.shared.yml +++ b/taskcluster/.shared.yml @@ -15,6 +15,7 @@ nodejs: packages_trusty: apt: 'nodejs sox' apt_pinning: '(echo "Package: nodejs" && echo "Pin: origin deb.nodesource.com" && echo "Pin-Priority: 999") > /etc/apt/preferences' + prep_12: 'echo "deb http://deb.nodesource.com/node_12.x trusty main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -' packages_xenial: apt: 'nodejs sox' apt_pinning: '(echo "Package: nodejs" && echo "Pin: origin deb.nodesource.com" && echo "Pin-Priority: 999") > /etc/apt/preferences' diff --git a/taskcluster/linux-amd64-cpu-opt.yml b/taskcluster/linux-amd64-cpu-opt.yml index c49950b2..4ace7987 100644 --- a/taskcluster/linux-amd64-cpu-opt.yml +++ b/taskcluster/linux-amd64-cpu-opt.yml @@ -8,7 +8,7 @@ build: - "notify.irc-channel.${notifications.irc}.on-failed" system_setup: > - ${nodejs.packages_trusty.prep_8} && ${nodejs.packages_trusty.apt_pinning} + ${nodejs.packages_trusty.prep_12} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install nodejs python-yaml && apt-get -qq -y install ${python.packages_trusty.apt} && ${swig.packages.install_script} system_config: diff --git a/taskcluster/linux-amd64-ctc-opt.yml b/taskcluster/linux-amd64-ctc-opt.yml index 28458007..fddec1ef 100644 --- a/taskcluster/linux-amd64-ctc-opt.yml +++ b/taskcluster/linux-amd64-ctc-opt.yml @@ -8,7 +8,7 @@ build: - "notify.irc-channel.${notifications.irc}.on-failed" system_setup: > - ${nodejs.packages_trusty.prep_8} && ${nodejs.packages_trusty.apt_pinning} + ${nodejs.packages_trusty.prep_12} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install nodejs python-yaml && apt-get -qq -y install ${python.packages_trusty.apt} && ${swig.packages.install_script} system_config: diff --git a/taskcluster/linux-amd64-gpu-opt.yml b/taskcluster/linux-amd64-gpu-opt.yml index 2311b747..bf880384 100644 --- a/taskcluster/linux-amd64-gpu-opt.yml +++ b/taskcluster/linux-amd64-gpu-opt.yml @@ -6,7 +6,7 @@ build: - "index.project.deepspeech.deepspeech.native_client.gpu.${event.head.sha}" system_setup: > - ${nodejs.packages_trusty.prep_8} && ${nodejs.packages_trusty.apt_pinning} + ${nodejs.packages_trusty.prep_12} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install nodejs python-yaml && apt-get -qq -y install ${python.packages_trusty.apt} && ${swig.packages.install_script} system_config: diff --git a/taskcluster/linux-amd64-tflite-opt.yml b/taskcluster/linux-amd64-tflite-opt.yml index 21790b16..c8b0a2f5 100644 --- a/taskcluster/linux-amd64-tflite-opt.yml +++ b/taskcluster/linux-amd64-tflite-opt.yml @@ -8,7 +8,7 @@ build: - "notify.irc-channel.${notifications.irc}.on-failed" system_setup: > - ${nodejs.packages_trusty.prep_8} && ${nodejs.packages_trusty.apt_pinning} + ${nodejs.packages_trusty.prep_12} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install nodejs python-yaml && apt-get -qq -y install ${python.packages_trusty.apt} && ${swig.packages.install_script} system_config: diff --git a/taskcluster/linux-arm64-cpu-opt.yml b/taskcluster/linux-arm64-cpu-opt.yml index 58ffe0fe..019851f7 100644 --- a/taskcluster/linux-arm64-cpu-opt.yml +++ b/taskcluster/linux-arm64-cpu-opt.yml @@ -11,7 +11,7 @@ build: apt-get -qq -y install gdebi git pixz && wget http://mirrors.kernel.org/ubuntu/pool/universe/m/multistrap/multistrap_2.2.0ubuntu2_all.deb -O /tmp/multistrap_2.2.0ubuntu2_all.deb && echo "y" | gdebi /tmp/multistrap_2.2.0ubuntu2_all.deb && - ${nodejs.packages_trusty.prep_8} && ${nodejs.packages_trusty.apt_pinning} + ${nodejs.packages_trusty.prep_12} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install nodejs python-yaml && apt-get -qq -y install ${python.packages_trusty.apt} && ${swig.packages.install_script} system_config: diff --git a/taskcluster/linux-rpi3-cpu-opt.yml b/taskcluster/linux-rpi3-cpu-opt.yml index 77510719..c9e301c3 100644 --- a/taskcluster/linux-rpi3-cpu-opt.yml +++ b/taskcluster/linux-rpi3-cpu-opt.yml @@ -11,7 +11,7 @@ build: apt-get -qq -y install gdebi git pixz && wget http://mirrors.kernel.org/ubuntu/pool/universe/m/multistrap/multistrap_2.2.0ubuntu2_all.deb -O /tmp/multistrap_2.2.0ubuntu2_all.deb && echo "y" | gdebi /tmp/multistrap_2.2.0ubuntu2_all.deb && - ${nodejs.packages_trusty.prep_8} && ${nodejs.packages_trusty.apt_pinning} + ${nodejs.packages_trusty.prep_12} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install nodejs python-yaml && apt-get -qq -y install ${python.packages_trusty.apt} && ${swig.packages.install_script} system_config: diff --git a/taskcluster/node-package-cpu.yml b/taskcluster/node-package-cpu.yml index 9ffe313e..056461e1 100644 --- a/taskcluster/node-package-cpu.yml +++ b/taskcluster/node-package-cpu.yml @@ -11,7 +11,7 @@ build: - "notify.irc-channel.${notifications.irc}.on-failed" system_setup: > - ${nodejs.packages_trusty.prep_6} && ${nodejs.packages_trusty.apt_pinning} + ${nodejs.packages_trusty.prep_12} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install nodejs python-yaml && apt-get -qq -y install ${python.packages_trusty.apt} && ${swig.packages.install_script} system_config: diff --git a/taskcluster/node-package-gpu.yml b/taskcluster/node-package-gpu.yml index ef15d87c..23888529 100644 --- a/taskcluster/node-package-gpu.yml +++ b/taskcluster/node-package-gpu.yml @@ -8,7 +8,7 @@ build: - "notify.irc-channel.${notifications.irc}.on-failed" system_setup: > - ${nodejs.packages_trusty.prep_6} && ${nodejs.packages_trusty.apt_pinning} + ${nodejs.packages_trusty.prep_12} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install nodejs python-yaml && apt-get -qq -y install ${python.packages_trusty.apt} && ${swig.packages.install_script} system_config: