From b832acb54b5e5ab56c6c192a8e6c0a625f36fc85 Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Wed, 8 Jul 2020 16:58:43 +0200 Subject: [PATCH] Fix #3141: Add ElectronJS v9.1 --- taskcluster/.shared.yml | 4 ++-- taskcluster/tc-all-vars.sh | 2 +- .../test-electronjs_v9.1-darwin-amd64-opt.yml | 15 +++++++++++++++ .../test-electronjs_v9.1-win-amd64-opt.yml | 14 ++++++++++++++ .../test-electronjs_v9.1_16k-linux-amd64-opt.yml | 15 +++++++++++++++ .../test-electronjs_v9.1_8k-linux-amd64-opt.yml | 15 +++++++++++++++ ...electronjs_v9.1_multiarchpkg-win-amd64-opt.yml | 14 ++++++++++++++ ...-electronjs_v9.1_multiarchpkg-win-cuda-opt.yml | 14 ++++++++++++++ ...lectronjs_v9.1_multiarchpkg-win-tflite-opt.yml | 14 ++++++++++++++ 9 files changed, 104 insertions(+), 3 deletions(-) create mode 100644 taskcluster/test-electronjs_v9.1-darwin-amd64-opt.yml create mode 100644 taskcluster/test-electronjs_v9.1-win-amd64-opt.yml create mode 100644 taskcluster/test-electronjs_v9.1_16k-linux-amd64-opt.yml create mode 100644 taskcluster/test-electronjs_v9.1_8k-linux-amd64-opt.yml create mode 100644 taskcluster/test-electronjs_v9.1_multiarchpkg-win-amd64-opt.yml create mode 100644 taskcluster/test-electronjs_v9.1_multiarchpkg-win-cuda-opt.yml create mode 100644 taskcluster/test-electronjs_v9.1_multiarchpkg-win-tflite-opt.yml diff --git a/taskcluster/.shared.yml b/taskcluster/.shared.yml index 00e2346c..765ad3a0 100644 --- a/taskcluster/.shared.yml +++ b/taskcluster/.shared.yml @@ -65,8 +65,8 @@ nodejs: prep_14: '/usr/bin/wget.exe https://nodejs.org/dist/v14.3.0/node-v14.3.0-win-x64.zip && ""C:\Program Files\7-zip\7z.exe"" x -o$TASKCLUSTER_NODE_DIR -tzip -aoa node-v14.3.0-win-x64.zip && rm node-*.zip && export PATH=$TASKCLUSTER_TASK_DIR/bin/node-v14.3.0-win-x64/:$PATH' system: node_gyp_cache: - url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.node-gyp-cache.6/artifacts/public/node-gyp-cache.tar.gz' - namespace: 'project.deepspeech.node-gyp-cache.6' + url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.node-gyp-cache.7/artifacts/public/node-gyp-cache.tar.gz' + namespace: 'project.deepspeech.node-gyp-cache.7' homebrew_builds: url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.homebrew_builds.7/artifacts/public/homebrew_builds.tar.gz' namespace: 'project.deepspeech.homebrew_builds.7' diff --git a/taskcluster/tc-all-vars.sh b/taskcluster/tc-all-vars.sh index 0fae9d3c..f2281faf 100755 --- a/taskcluster/tc-all-vars.sh +++ b/taskcluster/tc-all-vars.sh @@ -89,4 +89,4 @@ SUPPORTED_PYTHON_VERSIONS=${SUPPORTED_PYTHON_VERSIONS:-3.5.8:ucs2 3.6.10:ucs2 3. SUPPORTED_NODEJS_BUILD_VERSIONS=${SUPPORTED_NODEJS_BUILD_VERSIONS:-10.0.0 11.0.0 12.7.0 13.0.0 14.0.0} SUPPORTED_NODEJS_TESTS_VERSIONS=${SUPPORTED_NODEJS_TESTS_VERSIONS:-10.20.1 11.15.0 12.17.0 13.14.0 14.3.0} -SUPPORTED_ELECTRONJS_VERSIONS=${SUPPORTED_ELECTRONJS_VERSIONS:-5.0.13 6.0.12 6.1.7 7.0.1 7.1.8 8.0.1 9.0.1} +SUPPORTED_ELECTRONJS_VERSIONS=${SUPPORTED_ELECTRONJS_VERSIONS:-5.0.13 6.0.12 6.1.7 7.0.1 7.1.8 8.0.1 9.0.1 9.1.0} diff --git a/taskcluster/test-electronjs_v9.1-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v9.1-darwin-amd64-opt.yml new file mode 100644 index 00000000..3a1a7b29 --- /dev/null +++ b/taskcluster/test-electronjs_v9.1-darwin-amd64-opt.yml @@ -0,0 +1,15 @@ +build: + template_file: test-darwin-opt-base.tyml + dependencies: + - "darwin-amd64-cpu-opt" + - "test-training_16k-linux-amd64-py36m-opt" + - "homebrew_tests-darwin-amd64" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.brew.prep_12} + args: + tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 9.0.1 16k" + metadata: + name: "DeepSpeech OSX AMD64 CPU ElectronJS v9.1 tests" + description: "Testing DeepSpeech for OSX/AMD64 on ElectronJS v9.1, CPU only, optimized version" diff --git a/taskcluster/test-electronjs_v9.1-win-amd64-opt.yml b/taskcluster/test-electronjs_v9.1-win-amd64-opt.yml new file mode 100644 index 00000000..be83c3b3 --- /dev/null +++ b/taskcluster/test-electronjs_v9.1-win-amd64-opt.yml @@ -0,0 +1,14 @@ +build: + template_file: test-win-opt-base.tyml + dependencies: + - "win-amd64-cpu-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + system_setup: + > + ${system.sox_win} && ${nodejs.win.prep_12} + args: + tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 9.0.1 16k" + metadata: + name: "DeepSpeech Windows AMD64 CPU ElectronJS v9.1 tests" + description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS v9.1, CPU only, optimized version" diff --git a/taskcluster/test-electronjs_v9.1_16k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v9.1_16k-linux-amd64-opt.yml new file mode 100644 index 00000000..fdc01dc6 --- /dev/null +++ b/taskcluster/test-electronjs_v9.1_16k-linux-amd64-opt.yml @@ -0,0 +1,15 @@ +build: + template_file: test-linux-opt-base.tyml + docker_image: "ubuntu:16.04" + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 9.0.1 16k" + metadata: + name: "DeepSpeech Linux AMD64 CPU ElectronJS v9.1 tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v9.1, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-electronjs_v9.1_8k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v9.1_8k-linux-amd64-opt.yml new file mode 100644 index 00000000..c8684c3a --- /dev/null +++ b/taskcluster/test-electronjs_v9.1_8k-linux-amd64-opt.yml @@ -0,0 +1,15 @@ +build: + template_file: test-linux-opt-base.tyml + docker_image: "ubuntu:16.04" + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_8k-linux-amd64-py36m-opt" + test_model_task: "test-training_8k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 9.0.1 8k" + metadata: + name: "DeepSpeech Linux AMD64 CPU ElectronJS v9.1 tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v9.1, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-electronjs_v9.1_multiarchpkg-win-amd64-opt.yml b/taskcluster/test-electronjs_v9.1_multiarchpkg-win-amd64-opt.yml new file mode 100644 index 00000000..3a547a7f --- /dev/null +++ b/taskcluster/test-electronjs_v9.1_multiarchpkg-win-amd64-opt.yml @@ -0,0 +1,14 @@ +build: + template_file: test-win-opt-base.tyml + dependencies: + - "node-package-cpu" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + system_setup: + > + ${system.sox_win} && ${nodejs.win.prep_12} + args: + tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 9.0.1 16k" + metadata: + name: "DeepSpeech Windows AMD64 CPU ElectronJS MultiArch Package v9.1 tests" + description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS MultiArch Package v9.1, CPU only, optimized version" diff --git a/taskcluster/test-electronjs_v9.1_multiarchpkg-win-cuda-opt.yml b/taskcluster/test-electronjs_v9.1_multiarchpkg-win-cuda-opt.yml new file mode 100644 index 00000000..e9ab02da --- /dev/null +++ b/taskcluster/test-electronjs_v9.1_multiarchpkg-win-cuda-opt.yml @@ -0,0 +1,14 @@ +build: + template_file: test-win-cuda-opt-base.tyml + dependencies: + - "node-package-gpu" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + system_setup: + > + ${system.sox_win} && ${nodejs.win.prep_12} + args: + tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 9.0.1 16k cuda" + metadata: + name: "DeepSpeech Windows AMD64 CUDA ElectronJS MultiArch Package v9.1 tests" + description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS MultiArch Package v9.1, CUDA, optimized version" diff --git a/taskcluster/test-electronjs_v9.1_multiarchpkg-win-tflite-opt.yml b/taskcluster/test-electronjs_v9.1_multiarchpkg-win-tflite-opt.yml new file mode 100644 index 00000000..e2521f4b --- /dev/null +++ b/taskcluster/test-electronjs_v9.1_multiarchpkg-win-tflite-opt.yml @@ -0,0 +1,14 @@ +build: + template_file: test-win-opt-base.tyml + dependencies: + - "node-package-tflite" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + system_setup: + > + ${system.sox_win} && ${nodejs.win.prep_12} + args: + tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron_tflite-tests.sh 12.x 9.0.1 16k" + metadata: + name: "DeepSpeech Windows AMD64 TFLite ElectronJS MultiArch Package v9.1 tests" + description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS MultiArch Package v9.1, TFLite only, optimized version"