Skip to content

Commit

Permalink
Merge pull request mozilla#2311 from lissyx/armbian-buster
Browse files Browse the repository at this point in the history
Move to ARMbian Buster
  • Loading branch information
lissyx authored Aug 22, 2019
2 parents d5544b4 + dfe8be3 commit 18281b9
Show file tree
Hide file tree
Showing 33 changed files with 51 additions and 105 deletions.
6 changes: 3 additions & 3 deletions native_client/Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
###
### From topdir, first use multistrap to prepare a raspbian stretch armhf root
### $ sudo multistrap -d multistrap-raspbian-stretch -f native_client/multistrap_raspbian_stretch.conf
### From topdir, first use multistrap to prepare a raspbian buster armhf root
### $ multistrap -d multistrap-raspbian-buster -f native_client/multistrap_raspbian_buster.conf
###
### You can make a tarball after:
### $ touch multistrap-raspbian-stretch.tar && sudo tar cf multistrap-raspbian-stretch.tar multistrap-raspbian-stretch/ && xz multistrap-raspbian-stretch.tar
### $ touch multistrap-raspbian-buster.tar && sudo tar cf multistrap-raspbian-buster.tar multistrap-raspbian-buster/ && xz multistrap-raspbian-buster.tar
###
### Then cross-build:
### $ make -C native_client/ TARGET=rpi3 TFDIR=../../tensorflow/tensorflow/
Expand Down
4 changes: 2 additions & 2 deletions native_client/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,9 @@ And your command line for `LePotato` and `ARM64` should look like:
bazel build --workspace_status_command="bash native_client/bazel_workspace_status_cmd.sh" --config=monolithic --config=rpi3-armv8 --config=rpi3-armv8_opt -c opt --copt=-O3 --copt=-fvisibility=hidden //native_client:libdeepspeech.so //native_client:generate_trie
```

While we test only on RPi3 Raspbian Stretch and LePotato ARMBian stretch, anything compatible with `armv7-a cortex-a53` or `armv8-a cortex-a53` should be fine.
While we test only on RPi3 Raspbian Buster and LePotato ARMBian Buster, anything compatible with `armv7-a cortex-a53` or `armv8-a cortex-a53` should be fine.

The `deepspeech` binary can also be cross-built, with `TARGET=rpi3` or `TARGET=rpi3-armv8`. This might require you to setup a system tree using the tool `multistrap` and the multitrap configuration files: `native_client/multistrap_armbian64_stretch.conf` and `native_client/multistrap_raspbian_stretch.conf`.
The `deepspeech` binary can also be cross-built, with `TARGET=rpi3` or `TARGET=rpi3-armv8`. This might require you to setup a system tree using the tool `multistrap` and the multitrap configuration files: `native_client/multistrap_armbian64_buster.conf` and `native_client/multistrap_raspbian_buster.conf`.
The path of the system tree can be overridden from the default values defined in `definitions.mk` through the `RASPBIAN` `make` variable.

```
Expand Down
7 changes: 4 additions & 3 deletions native_client/definitions.mk
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ endif # ($(TARGET),rpi3)

ifeq ($(TARGET),rpi3-armv8)
TOOLCHAIN ?= ${TFDIR}/bazel-$(shell basename "${TFDIR}")/external/LinaroAarch64Gcc72/bin/aarch64-linux-gnu-
RASPBIAN ?= $(abspath $(NC_DIR)/../multistrap-raspbian64-stretch)
RASPBIAN ?= $(abspath $(NC_DIR)/../multistrap-raspbian64-buster)
CFLAGS := -march=armv8-a -mtune=cortex-a53 -D_GLIBCXX_USE_CXX11_ABI=0 --sysroot $(RASPBIAN)
CXXFLAGS := $(CFLAGS)
LDFLAGS := -Wl,-rpath-link,$(RASPBIAN)/lib/aarch64-linux-gnu/ -Wl,-rpath-link,$(RASPBIAN)/usr/lib/aarch64-linux-gnu/
Expand All @@ -80,8 +80,9 @@ SOX_LDFLAGS := $(RASPBIAN)/usr/lib/aarch64-linux-gnu/libsox.so

PYVER := $(shell python -c "import platform; maj, min, _ = platform.python_version_tuple(); print(maj+'.'+min);")
PYTHON_PACKAGES :=
PYTHON_PATH := PYTHONPATH=$(RASPBIAN)/usr/lib/python$(PYVER)/:$(RASPBIAN)/usr/lib/python$(PYVER)/plat-aarch64-linux-gnu/:$(RASPBIAN)/usr/lib/python3/dist-packages/
NUMPY_INCLUDE := NUMPY_INCLUDE=$(RASPBIAN)/usr/include/python3.5/
PYTHON_PATH := PYTHONPATH=$(RASPBIAN)/usr/lib/python$(PYVER)/:$(RASPBIAN)/usr/lib/python3/dist-packages/
PYTHON_SYSCONFIGDATA := _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_m_linux_aarch64-linux-gnu
NUMPY_INCLUDE := NUMPY_INCLUDE=$(RASPBIAN)/usr/include/python3.7/
PYTHON_PLATFORM_NAME := --plat-name linux_aarch64
NODE_PLATFORM_TARGET := --target_arch=arm64 --target_platform=linux
TOOLCHAIN_LDD_OPTS := --root $(RASPBIAN)/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ aptsources=Debian
cleanup=true

[Debian]
packages=libc6 libc6-dev libstdc++-6-dev linux-libc-dev libpython2.7-dev libpython3.5-dev libsox-dev python-numpy
packages=libc6 libc6-dev libstdc++-7-dev linux-libc-dev libffi-dev libpython3.7-dev libsox-dev python3-numpy python3-setuptools
source=http://deb.debian.org/debian
keyring=debian-archive-keyring
components=main
suite=stretch
suite=buster
14 changes: 0 additions & 14 deletions native_client/multistrap_raspbian_stretch.conf

This file was deleted.

24 changes: 11 additions & 13 deletions taskcluster/.shared.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
python:
packages_trusty:
apt: 'make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev liblzma-dev curl llvm libncurses5-dev libncursesw5-dev xz-utils tk-dev libpng-dev libsox-dev libmagic-dev libgsm1-dev libltdl-dev'
packages_stretch:
apt: 'make build-essential libssl1.0-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev curl llvm libncurses5-dev libncursesw5-dev xz-utils tk-dev'
packages_buster:
apt: 'make build-essential libssl1.0-dev libffi-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev curl llvm libncurses5-dev libncursesw5-dev xz-utils tk-dev'
apt: 'make build-essential libssl-dev libffi-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev curl llvm libncurses5-dev libncursesw5-dev xz-utils tk-dev'
brew:
setup: 'install_local_homebrew "python-ds-test" && install_pkg_local_homebrew "sox" && install_pkg_local_homebrew "readline" && install_pkg_local_homebrew "openssl" && install_pkg_local_homebrew "pkg-config"'
env: 'export EXTRA_ENV="PATH=$TASKCLUSTER_TASK_DIR/python-ds-test.brew/bin/:$PATH"'
Expand All @@ -27,18 +25,18 @@ nodejs:
prep_10: 'echo "deb http://deb.nodesource.com/node_10.x xenial main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
prep_11: 'echo "deb http://deb.nodesource.com/node_11.x xenial main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
prep_12: 'echo "deb http://deb.nodesource.com/node_12.x xenial main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
packages_stretch:
packages_buster:
apt: 'nodejs sox'
apt_pinning: '(echo "Package: nodejs" && echo "Pin: origin deb.nodesource.com" && echo "Pin-Priority: 999") > /etc/apt/preferences'
prep_4: 'echo "deb http://deb.nodesource.com/node_4.x stretch main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
prep_5: 'echo "deb http://deb.nodesource.com/node_5.x stretch main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
prep_6: 'echo "deb http://deb.nodesource.com/node_6.x stretch main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
prep_7: 'echo "deb http://deb.nodesource.com/node_7.x stretch main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
prep_8: 'echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
prep_9: 'echo "deb http://deb.nodesource.com/node_9.x stretch main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
prep_10: 'echo "deb http://deb.nodesource.com/node_10.x stretch main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
prep_11: 'echo "deb http://deb.nodesource.com/node_11.x stretch main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
prep_12: 'echo "deb http://deb.nodesource.com/node_12.x stretch main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
prep_4: 'echo "deb http://deb.nodesource.com/node_4.x buster main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
prep_5: 'echo "deb http://deb.nodesource.com/node_5.x buster main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
prep_6: 'echo "deb http://deb.nodesource.com/node_6.x buster main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
prep_7: 'echo "deb http://deb.nodesource.com/node_7.x buster main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
prep_8: 'echo "deb http://deb.nodesource.com/node_8.x buster main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
prep_9: 'echo "deb http://deb.nodesource.com/node_9.x buster main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
prep_10: 'echo "deb http://deb.nodesource.com/node_10.x buster main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
prep_11: 'echo "deb http://deb.nodesource.com/node_11.x buster main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
prep_12: 'echo "deb http://deb.nodesource.com/node_12.x buster main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -'
brew:
# Using 'nvm' from homebrew results in installing v0.33.6 which seems to
# suffer from a bug making it unable to work as of now:
Expand Down
4 changes: 2 additions & 2 deletions taskcluster/arm64-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ BAZEL_TARGETS="
BAZEL_BUILD_FLAGS="${BAZEL_ARM64_FLAGS} ${BAZEL_EXTRA_FLAGS}"
BAZEL_ENV_FLAGS="TF_NEED_CUDA=0"
SYSTEM_TARGET=rpi3-armv8
SYSTEM_RASPBIAN=/tmp/multistrap-armbian64-stretch
SYSTEM_RASPBIAN=/tmp/multistrap-armbian64-buster

maybe_install_xldd

do_bazel_build

do_deepspeech_binary_build

export SUPPORTED_PYTHON_VERSIONS="3.5.3:ucs4"
export SUPPORTED_PYTHON_VERSIONS="3.7.3:ucs4"
do_deepspeech_python_build

do_deepspeech_nodejs_build
4 changes: 2 additions & 2 deletions taskcluster/build-python-wheel.tyml
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ then:

payload:
maxRunTime: 14400
image: "arm64v8/debian:stretch-20180312"
image: "arm64v8/debian:buster-20190812"

command:
- "/bin/bash"
- "--login"
- "-cxe"
- >
apt-get -qq update && apt-get -qq -y install libopenblas-dev liblapack-dev gnupg pixz sudo wget python3.5-minimal python3-pip python3-wheel python3-setuptools &&
apt-get -qq update && apt-get -qq -y install libopenblas-dev liblapack-dev gnupg pixz sudo wget python3.7-minimal python3-pip python3-wheel python3-setuptools &&
mkdir -p /opt/wheels /tmp/artifacts &&
cd /opt/wheels &&
pip3 wheel --verbose --wheel-dir /tmp/artifacts/ --build $(pwd)/ --no-binary :all: numpy &&
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/linux-arm64-cpu-opt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ build:
apt-get -qq -y install ${python.packages_trusty.apt} && ${swig.packages.install_script}
system_config:
>
multistrap -d /tmp/multistrap-armbian64-stretch/ -f ${system.homedir.linux}/DeepSpeech/ds/native_client/multistrap_armbian64_stretch.conf &&
multistrap -d /tmp/multistrap-armbian64-buster/ -f ${system.homedir.linux}/DeepSpeech/ds/native_client/multistrap_armbian64_buster.conf &&
${swig.patch_nodejs.linux}
scripts:
build: "taskcluster/arm64-build.sh"
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/tc-tests-utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1037,7 +1037,7 @@ maybe_numpy_min_version_winamd64()
;;
3.7*)
export NUMPY_BUILD_VERSION="==1.14.5"
export NUMPY_DEP_VERSION=">=1.14.5,<1.16.0"
export NUMPY_DEP_VERSION=">=1.14.5,<=1.17.0"
;;
esac
}
Expand Down
4 changes: 2 additions & 2 deletions taskcluster/test-armbian-opt-base.tyml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ then:

payload:
maxRunTime: { $eval: to_int(build.maxRunTime) }
image: "arm64v8/debian:stretch-20180312"
image: "arm64v8/debian:buster-20190812"

env:
$let:
Expand All @@ -42,7 +42,7 @@ then:
DEEPSPEECH_PROD_MODEL_MMAP: https://github.com/reuben/DeepSpeech/releases/download/v0.6.0-alpha.4/output_graph.pbmm
PIP_DEFAULT_TIMEOUT: "60"
PIP_EXTRA_INDEX_URL: "https://lissyx.github.io/deepspeech-python-wheels/"
EXTRA_PYTHON_CONFIGURE_OPTS: "--with-fpectl" # Required by Debian Stretch
EXTRA_PYTHON_CONFIGURE_OPTS: "" # Required by Debian Buster
EXPECTED_TENSORFLOW_VERSION: "${build.tensorflow_git_desc}"

command:
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-nodejs_10x-armbian-arm64-opt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build:
- "test-training_upstream-linux-amd64-py35m-opt"
system_setup:
>
${nodejs.packages_stretch.prep_10} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt}
${nodejs.packages_buster.prep_10} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
args:
tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 10.x"
metadata:
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-nodejs_10x-raspbian-rpi3-opt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build:
- "test-training_upstream-linux-amd64-py35m-opt"
system_setup:
>
${nodejs.packages_stretch.prep_10} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt}
${nodejs.packages_buster.prep_10} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
args:
tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 10.x"
metadata:
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-nodejs_11x-armbian-arm64-opt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build:
- "test-training_upstream-linux-amd64-py35m-opt"
system_setup:
>
${nodejs.packages_stretch.prep_11} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt}
${nodejs.packages_buster.prep_11} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
args:
tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 11.x"
metadata:
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-nodejs_11x-raspbian-rpi3-opt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build:
- "test-training_upstream-linux-amd64-py35m-opt"
system_setup:
>
${nodejs.packages_stretch.prep_11} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt}
${nodejs.packages_buster.prep_11} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
args:
tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 11.x"
metadata:
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-nodejs_12x-armbian-arm64-opt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build:
- "test-training_upstream-linux-amd64-py35m-opt"
system_setup:
>
${nodejs.packages_stretch.prep_12} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt}
${nodejs.packages_buster.prep_12} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
args:
tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 12.x"
metadata:
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-nodejs_12x-raspbian-rpi3-opt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build:
- "test-training_upstream-linux-amd64-py35m-opt"
system_setup:
>
${nodejs.packages_stretch.prep_12} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt}
${nodejs.packages_buster.prep_12} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
args:
tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 12.x"
metadata:
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-nodejs_4x-armbian-arm64-opt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build:
- "test-training_upstream-linux-amd64-py35m-opt"
system_setup:
>
${nodejs.packages_stretch.prep_4} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt}
${nodejs.packages_buster.prep_4} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
args:
tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 4.x"
metadata:
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-nodejs_4x-raspbian-rpi3-opt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build:
- "test-training_upstream-linux-amd64-py35m-opt"
system_setup:
>
${nodejs.packages_stretch.prep_4} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt}
${nodejs.packages_buster.prep_4} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
args:
tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 4.x"
metadata:
Expand Down
13 changes: 0 additions & 13 deletions taskcluster/test-nodejs_5x-armbian-arm64-opt.yml-disabled

This file was deleted.

13 changes: 0 additions & 13 deletions taskcluster/test-nodejs_5x-raspbian-rpi3-opt.yml-disabled

This file was deleted.

2 changes: 1 addition & 1 deletion taskcluster/test-nodejs_6x-armbian-arm64-opt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build:
- "test-training_upstream-linux-amd64-py35m-opt"
system_setup:
>
${nodejs.packages_stretch.prep_6} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt}
${nodejs.packages_buster.prep_6} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
args:
tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 6.x"
metadata:
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-nodejs_6x-raspbian-rpi3-opt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build:
- "test-training_upstream-linux-amd64-py35m-opt"
system_setup:
>
${nodejs.packages_stretch.prep_6} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt}
${nodejs.packages_buster.prep_6} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
args:
tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 6.x"
metadata:
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-nodejs_7x-armbian-arm64-opt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build:
- "test-training_upstream-linux-amd64-py35m-opt"
system_setup:
>
${nodejs.packages_stretch.prep_7} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt}
${nodejs.packages_buster.prep_7} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
args:
tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 7.x"
metadata:
Expand Down
Loading

0 comments on commit 18281b9

Please sign in to comment.