From 9ace106ce78a68d9e445d879a7dc0190d0d68bdd Mon Sep 17 00:00:00 2001 From: Brian Robinson Date: Wed, 10 Nov 2021 08:18:25 -0700 Subject: [PATCH 1/6] Add newer electron versions --- taskcluster/tc-all-vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taskcluster/tc-all-vars.sh b/taskcluster/tc-all-vars.sh index e3bf6192fd..d9e41e9750 100755 --- a/taskcluster/tc-all-vars.sh +++ b/taskcluster/tc-all-vars.sh @@ -95,4 +95,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 15.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 15.0.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 9.1.0 9.2.0 10.0.0 10.1.0 11.0.0 12.0.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 9.1.0 9.2.0 10.0.0 10.1.0 11.0.0 12.0.0 13.6.1 14.2.1 15.3.1} \ No newline at end of file From 1a6df43b13728deabaf066491b6b2f03ab96e40e Mon Sep 17 00:00:00 2001 From: Brian Robinson Date: Wed, 10 Nov 2021 18:44:05 -0700 Subject: [PATCH 2/6] Add test files for new versions --- .../test-electronjs_v13.6-darwin-amd64-opt.yml | 15 +++++++++++++++ .../test-electronjs_v13.6-win-amd64-opt.yml | 14 ++++++++++++++ ...test-electronjs_v13.6_16k-linux-amd64-opt.yml | 16 ++++++++++++++++ .../test-electronjs_v13.6_8k-linux-amd64-opt.yml | 16 ++++++++++++++++ ...ectronjs_v13.6_multiarchpkg-win-amd64-opt.yml | 14 ++++++++++++++ ...lectronjs_v13.6_multiarchpkg-win-cuda-opt.yml | 14 ++++++++++++++ ...ctronjs_v13.6_multiarchpkg-win-tflite-opt.yml | 14 ++++++++++++++ .../test-electronjs_v14.2-darwin-amd64-opt.yml | 15 +++++++++++++++ .../test-electronjs_v14.2-win-amd64-opt.yml | 14 ++++++++++++++ ...test-electronjs_v14.2_16k-linux-amd64-opt.yml | 16 ++++++++++++++++ .../test-electronjs_v14.2_8k-linux-amd64-opt.yml | 16 ++++++++++++++++ ...ectronjs_v14.2_multiarchpkg-win-amd64-opt.yml | 14 ++++++++++++++ ...lectronjs_v14.2_multiarchpkg-win-cuda-opt.yml | 14 ++++++++++++++ ...ctronjs_v14.2_multiarchpkg-win-tflite-opt.yml | 14 ++++++++++++++ .../test-electronjs_v15.3-darwin-amd64-opt.yml | 15 +++++++++++++++ .../test-electronjs_v15.3-win-amd64-opt.yml | 14 ++++++++++++++ ...test-electronjs_v15.3_16k-linux-amd64-opt.yml | 16 ++++++++++++++++ .../test-electronjs_v15.3_8k-linux-amd64-opt.yml | 16 ++++++++++++++++ ...ectronjs_v15.3_multiarchpkg-win-amd64-opt.yml | 14 ++++++++++++++ ...lectronjs_v15.3_multiarchpkg-win-cuda-opt.yml | 14 ++++++++++++++ ...ctronjs_v15.3_multiarchpkg-win-tflite-opt.yml | 14 ++++++++++++++ 21 files changed, 309 insertions(+) create mode 100644 taskcluster/test-electronjs_v13.6-darwin-amd64-opt.yml create mode 100644 taskcluster/test-electronjs_v13.6-win-amd64-opt.yml create mode 100644 taskcluster/test-electronjs_v13.6_16k-linux-amd64-opt.yml create mode 100644 taskcluster/test-electronjs_v13.6_8k-linux-amd64-opt.yml create mode 100644 taskcluster/test-electronjs_v13.6_multiarchpkg-win-amd64-opt.yml create mode 100644 taskcluster/test-electronjs_v13.6_multiarchpkg-win-cuda-opt.yml create mode 100644 taskcluster/test-electronjs_v13.6_multiarchpkg-win-tflite-opt.yml create mode 100644 taskcluster/test-electronjs_v14.2-darwin-amd64-opt.yml create mode 100644 taskcluster/test-electronjs_v14.2-win-amd64-opt.yml create mode 100644 taskcluster/test-electronjs_v14.2_16k-linux-amd64-opt.yml create mode 100644 taskcluster/test-electronjs_v14.2_8k-linux-amd64-opt.yml create mode 100644 taskcluster/test-electronjs_v14.2_multiarchpkg-win-amd64-opt.yml create mode 100644 taskcluster/test-electronjs_v14.2_multiarchpkg-win-cuda-opt.yml create mode 100644 taskcluster/test-electronjs_v14.2_multiarchpkg-win-tflite-opt.yml create mode 100644 taskcluster/test-electronjs_v15.3-darwin-amd64-opt.yml create mode 100644 taskcluster/test-electronjs_v15.3-win-amd64-opt.yml create mode 100644 taskcluster/test-electronjs_v15.3_16k-linux-amd64-opt.yml create mode 100644 taskcluster/test-electronjs_v15.3_8k-linux-amd64-opt.yml create mode 100644 taskcluster/test-electronjs_v15.3_multiarchpkg-win-amd64-opt.yml create mode 100644 taskcluster/test-electronjs_v15.3_multiarchpkg-win-cuda-opt.yml create mode 100644 taskcluster/test-electronjs_v15.3_multiarchpkg-win-tflite-opt.yml diff --git a/taskcluster/test-electronjs_v13.6-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v13.6-darwin-amd64-opt.yml new file mode 100644 index 0000000000..2905149ff3 --- /dev/null +++ b/taskcluster/test-electronjs_v13.6-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 13.6.1 16k" + metadata: + name: "DeepSpeech OSX AMD64 CPU ElectronJS v13.6 tests" + description: "Testing DeepSpeech for OSX/AMD64 on ElectronJS v13.6, CPU only, optimized version" diff --git a/taskcluster/test-electronjs_v13.6-win-amd64-opt.yml b/taskcluster/test-electronjs_v13.6-win-amd64-opt.yml new file mode 100644 index 0000000000..929a9452d5 --- /dev/null +++ b/taskcluster/test-electronjs_v13.6-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 13.6.1 16k" + metadata: + name: "DeepSpeech Windows AMD64 CPU ElectronJS v13.6 tests" + description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS v13.6, CPU only, optimized version" diff --git a/taskcluster/test-electronjs_v13.6_16k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v13.6_16k-linux-amd64-opt.yml new file mode 100644 index 0000000000..4f80aec93b --- /dev/null +++ b/taskcluster/test-electronjs_v13.6_16k-linux-amd64-opt.yml @@ -0,0 +1,16 @@ +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 13.6.1 16k" + workerType: "${docker.dsTests}" + metadata: + name: "DeepSpeech Linux AMD64 CPU ElectronJS v13.6 tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v13.6, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-electronjs_v13.6_8k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v13.6_8k-linux-amd64-opt.yml new file mode 100644 index 0000000000..dc45e7c9c9 --- /dev/null +++ b/taskcluster/test-electronjs_v13.6_8k-linux-amd64-opt.yml @@ -0,0 +1,16 @@ +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 13.6.1 8k" + workerType: "${docker.dsTests}" + metadata: + name: "DeepSpeech Linux AMD64 CPU ElectronJS v13.6 tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v13.6, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-electronjs_v13.6_multiarchpkg-win-amd64-opt.yml b/taskcluster/test-electronjs_v13.6_multiarchpkg-win-amd64-opt.yml new file mode 100644 index 0000000000..e3f375c8b1 --- /dev/null +++ b/taskcluster/test-electronjs_v13.6_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 13.6.1 16k" + metadata: + name: "DeepSpeech Windows AMD64 CPU ElectronJS MultiArch Package v13.6 tests" + description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS MultiArch Package v13.6, CPU only, optimized version" diff --git a/taskcluster/test-electronjs_v13.6_multiarchpkg-win-cuda-opt.yml b/taskcluster/test-electronjs_v13.6_multiarchpkg-win-cuda-opt.yml new file mode 100644 index 0000000000..3db39de664 --- /dev/null +++ b/taskcluster/test-electronjs_v13.6_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 13.6.1 16k cuda" + metadata: + name: "DeepSpeech Windows AMD64 CUDA ElectronJS MultiArch Package v13.6 tests" + description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS MultiArch Package v13.6, CUDA, optimized version" diff --git a/taskcluster/test-electronjs_v13.6_multiarchpkg-win-tflite-opt.yml b/taskcluster/test-electronjs_v13.6_multiarchpkg-win-tflite-opt.yml new file mode 100644 index 0000000000..3be5ae9ee4 --- /dev/null +++ b/taskcluster/test-electronjs_v13.6_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 13.6.1 16k" + metadata: + name: "DeepSpeech Windows AMD64 TFLite ElectronJS MultiArch Package v13.6 tests" + description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS MultiArch Package v13.6, TFLite only, optimized version" diff --git a/taskcluster/test-electronjs_v14.2-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v14.2-darwin-amd64-opt.yml new file mode 100644 index 0000000000..4fd718168c --- /dev/null +++ b/taskcluster/test-electronjs_v14.2-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 14.2.1 16k" + metadata: + name: "DeepSpeech OSX AMD64 CPU ElectronJS v14.2 tests" + description: "Testing DeepSpeech for OSX/AMD64 on ElectronJS v14.2, CPU only, optimized version" diff --git a/taskcluster/test-electronjs_v14.2-win-amd64-opt.yml b/taskcluster/test-electronjs_v14.2-win-amd64-opt.yml new file mode 100644 index 0000000000..3611bf1b4e --- /dev/null +++ b/taskcluster/test-electronjs_v14.2-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 14.2.1 16k" + metadata: + name: "DeepSpeech Windows AMD64 CPU ElectronJS v14.2 tests" + description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS v14.2, CPU only, optimized version" diff --git a/taskcluster/test-electronjs_v14.2_16k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v14.2_16k-linux-amd64-opt.yml new file mode 100644 index 0000000000..31b1a24374 --- /dev/null +++ b/taskcluster/test-electronjs_v14.2_16k-linux-amd64-opt.yml @@ -0,0 +1,16 @@ +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 14.2.1 16k" + workerType: "${docker.dsTests}" + metadata: + name: "DeepSpeech Linux AMD64 CPU ElectronJS v14.2 tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v14.2, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-electronjs_v14.2_8k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v14.2_8k-linux-amd64-opt.yml new file mode 100644 index 0000000000..754c3d3dc6 --- /dev/null +++ b/taskcluster/test-electronjs_v14.2_8k-linux-amd64-opt.yml @@ -0,0 +1,16 @@ +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 14.2.1 8k" + workerType: "${docker.dsTests}" + metadata: + name: "DeepSpeech Linux AMD64 CPU ElectronJS v14.2 tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v14.2, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-electronjs_v14.2_multiarchpkg-win-amd64-opt.yml b/taskcluster/test-electronjs_v14.2_multiarchpkg-win-amd64-opt.yml new file mode 100644 index 0000000000..7268e37030 --- /dev/null +++ b/taskcluster/test-electronjs_v14.2_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 14.2.1 16k" + metadata: + name: "DeepSpeech Windows AMD64 CPU ElectronJS MultiArch Package v14.2 tests" + description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS MultiArch Package v14.2, CPU only, optimized version" diff --git a/taskcluster/test-electronjs_v14.2_multiarchpkg-win-cuda-opt.yml b/taskcluster/test-electronjs_v14.2_multiarchpkg-win-cuda-opt.yml new file mode 100644 index 0000000000..5f22052607 --- /dev/null +++ b/taskcluster/test-electronjs_v14.2_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 14.2.1 16k cuda" + metadata: + name: "DeepSpeech Windows AMD64 CUDA ElectronJS MultiArch Package v14.2 tests" + description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS MultiArch Package v14.2, CUDA, optimized version" diff --git a/taskcluster/test-electronjs_v14.2_multiarchpkg-win-tflite-opt.yml b/taskcluster/test-electronjs_v14.2_multiarchpkg-win-tflite-opt.yml new file mode 100644 index 0000000000..da50cb93ca --- /dev/null +++ b/taskcluster/test-electronjs_v14.2_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 14.2.1 16k" + metadata: + name: "DeepSpeech Windows AMD64 TFLite ElectronJS MultiArch Package v14.2 tests" + description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS MultiArch Package v14.2, TFLite only, optimized version" diff --git a/taskcluster/test-electronjs_v15.3-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v15.3-darwin-amd64-opt.yml new file mode 100644 index 0000000000..5137590b99 --- /dev/null +++ b/taskcluster/test-electronjs_v15.3-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 15.3.1 16k" + metadata: + name: "DeepSpeech OSX AMD64 CPU ElectronJS v15.3 tests" + description: "Testing DeepSpeech for OSX/AMD64 on ElectronJS v15.3, CPU only, optimized version" diff --git a/taskcluster/test-electronjs_v15.3-win-amd64-opt.yml b/taskcluster/test-electronjs_v15.3-win-amd64-opt.yml new file mode 100644 index 0000000000..3a3ac0a2ee --- /dev/null +++ b/taskcluster/test-electronjs_v15.3-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 15.3.1 16k" + metadata: + name: "DeepSpeech Windows AMD64 CPU ElectronJS v15.3 tests" + description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS v15.3, CPU only, optimized version" diff --git a/taskcluster/test-electronjs_v15.3_16k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v15.3_16k-linux-amd64-opt.yml new file mode 100644 index 0000000000..65f3ef5c47 --- /dev/null +++ b/taskcluster/test-electronjs_v15.3_16k-linux-amd64-opt.yml @@ -0,0 +1,16 @@ +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 15.3.1 16k" + workerType: "${docker.dsTests}" + metadata: + name: "DeepSpeech Linux AMD64 CPU ElectronJS v15.3 tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v15.3, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-electronjs_v15.3_8k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v15.3_8k-linux-amd64-opt.yml new file mode 100644 index 0000000000..d65d86756f --- /dev/null +++ b/taskcluster/test-electronjs_v15.3_8k-linux-amd64-opt.yml @@ -0,0 +1,16 @@ +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 15.3.1 8k" + workerType: "${docker.dsTests}" + metadata: + name: "DeepSpeech Linux AMD64 CPU ElectronJS v15.3 tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v15.3, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-electronjs_v15.3_multiarchpkg-win-amd64-opt.yml b/taskcluster/test-electronjs_v15.3_multiarchpkg-win-amd64-opt.yml new file mode 100644 index 0000000000..56e66df3d6 --- /dev/null +++ b/taskcluster/test-electronjs_v15.3_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 15.3.1 16k" + metadata: + name: "DeepSpeech Windows AMD64 CPU ElectronJS MultiArch Package v15.3 tests" + description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS MultiArch Package v15.3, CPU only, optimized version" diff --git a/taskcluster/test-electronjs_v15.3_multiarchpkg-win-cuda-opt.yml b/taskcluster/test-electronjs_v15.3_multiarchpkg-win-cuda-opt.yml new file mode 100644 index 0000000000..2f3342fde4 --- /dev/null +++ b/taskcluster/test-electronjs_v15.3_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 15.3.1 16k cuda" + metadata: + name: "DeepSpeech Windows AMD64 CUDA ElectronJS MultiArch Package v15.3 tests" + description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS MultiArch Package v15.3, CUDA, optimized version" diff --git a/taskcluster/test-electronjs_v15.3_multiarchpkg-win-tflite-opt.yml b/taskcluster/test-electronjs_v15.3_multiarchpkg-win-tflite-opt.yml new file mode 100644 index 0000000000..df014dbfc3 --- /dev/null +++ b/taskcluster/test-electronjs_v15.3_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 15.3.1 16k" + metadata: + name: "DeepSpeech Windows AMD64 TFLite ElectronJS MultiArch Package v15.3 tests" + description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS MultiArch Package v15.3, TFLite only, optimized version" From e58b6d825ea30b53006e8a82ffb6fbe91c377fbe Mon Sep 17 00:00:00 2001 From: Brian Robinson Date: Wed, 10 Nov 2021 19:05:11 -0700 Subject: [PATCH 3/6] Update pcre url --- .github/workflows/build-and-test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 5291d109bc..5583b9f791 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -42,7 +42,7 @@ jobs: sudo apt-get install -y --no-install-recommends autoconf automake bison build-essential mingw-w64 if: steps.swig-build-cache.outputs.cache-hit != 'true' - run: | - curl -sSL https://ftp.pcre.org/pub/pcre/pcre-8.43.tar.gz > pcre-8.43.tar.gz + curl -sSL https://sourceforge.net/projects/pcre/files/pcre/8.43/pcre-8.43.tar.gz/download > pcre-8.43.tar.gz if: steps.swig-build-cache.outputs.cache-hit != 'true' - run: | ./Tools/pcre-build.sh --host=x86_64-w64-mingw32 @@ -87,7 +87,7 @@ jobs: sudo apt-get install -y --no-install-recommends autoconf automake bison build-essential if: steps.swig-build-cache.outputs.cache-hit != 'true' - run: | - curl -sSL https://ftp.pcre.org/pub/pcre/pcre-8.43.tar.gz > pcre-8.43.tar.gz + curl -sSL https://sourceforge.net/projects/pcre/files/pcre/8.43/pcre-8.43.tar.gz/download > pcre-8.43.tar.gz if: steps.swig-build-cache.outputs.cache-hit != 'true' - run: | ./Tools/pcre-build.sh @@ -625,7 +625,7 @@ jobs: brew install automake if: steps.swig-build-cache.outputs.cache-hit != 'true' - run: | - curl -sSL https://ftp.pcre.org/pub/pcre/pcre-8.43.tar.gz > pcre-8.43.tar.gz + curl -sSL https://sourceforge.net/projects/pcre/files/pcre/8.43/pcre-8.43.tar.gz/download > pcre-8.43.tar.gz if: steps.swig-build-cache.outputs.cache-hit != 'true' - run: | ./Tools/pcre-build.sh From bdf34d3f63dce59d1dacafa4e8105d3d3a8708b9 Mon Sep 17 00:00:00 2001 From: Brian Robinson Date: Thu, 11 Nov 2021 19:15:21 -0700 Subject: [PATCH 4/6] Add new electron versions to workflows --- .github/workflows/build-and-test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 5583b9f791..15703d5010 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -554,7 +554,7 @@ jobs: if: ${{ github.event_name == 'pull_request' }} strategy: matrix: - electronjs-version: [5.0.13, 6.1.7, 7.1.8, 8.0.1, 9.2.0, 10.1.0, 11.0.0, 12.0.0] + electronjs-version: [5.0.13, 6.1.7, 7.1.8, 8.0.1, 9.2.0, 10.1.0, 11.0.0, 12.0.0, 13.6.1, 14.2.1, 15.3.1] build-flavor: ["tf", "tflite"] models: ["test"] bitrate: ["16k"] @@ -1094,7 +1094,7 @@ jobs: if: ${{ github.event_name == 'pull_request' }} strategy: matrix: - electronjs-version: [5.0.13, 6.1.7, 7.1.8, 8.0.1, 9.2.0, 10.1.0, 11.0.0, 12.0.0] + electronjs-version: [5.0.13, 6.1.7, 7.1.8, 8.0.1, 9.2.0, 10.1.0, 11.0.0, 12.0.0, 13.6.1, 14.2.1, 15.3.1] build-flavor: ["tf", "tflite"] models: ["test"] bitrate: ["16k"] @@ -1610,7 +1610,7 @@ jobs: if: ${{ github.event_name == 'pull_request' }} strategy: matrix: - electronjs-version: [5.0.13, 6.1.7, 7.1.8, 8.0.1, 9.2.0, 10.1.0, 11.0.0, 12.0.0] + electronjs-version: [5.0.13, 6.1.7, 7.1.8, 8.0.1, 9.2.0, 10.1.0, 11.0.0, 12.0.0, 13.6.1, 14.2.1, 15.3.1] build-flavor: ["tf", "tflite"] models: ["test"] bitrate: ["16k"] @@ -2818,7 +2818,7 @@ jobs: strategy: matrix: arch: [ "armv7", "aarch64" ] - electronjs-version: [5.0.13, 6.1.7, 7.1.8, 8.0.1, 9.2.0, 10.1.0, 11.0.0, 12.0.0] + electronjs-version: [5.0.13, 6.1.7, 7.1.8, 8.0.1, 9.2.0, 10.1.0, 11.0.0, 12.0.0, , 13.6.1, 14.2.1, 15.3.1] build-flavor: ["tflite"] models: ["test"] bitrate: ["16k"] From 35fc737df9f014bcd088e4ea61b8e77482a815f9 Mon Sep 17 00:00:00 2001 From: Brian Robinson Date: Thu, 11 Nov 2021 19:20:44 -0700 Subject: [PATCH 5/6] fix typo --- .github/workflows/build-and-test.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 15703d5010..b6c78a8893 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -1791,7 +1791,7 @@ jobs: if: ${{ github.event_name == 'pull_request' }} strategy: matrix: - electronjs-version: [5.0.13, 12.0.0] + electronjs-version: [5.0.13, 15.3.1] build-flavor: ["tf", "tflite"] models: ["test", "prod"] bitrate: ["8k", "16k"] @@ -1901,7 +1901,7 @@ jobs: if: ${{ github.event_name == 'pull_request' }} strategy: matrix: - electronjs-version: [5.0.13, 12.0.0] + electronjs-version: [5.0.13, 15.3.1] build-flavor: ["tf", "tflite"] models: ["test", "prod"] bitrate: ["8k", "16k"] @@ -2021,7 +2021,7 @@ jobs: if: ${{ github.event_name == 'pull_request' }} strategy: matrix: - electronjs-version: [5.0.13, 12.0.0] + electronjs-version: [5.0.13, 15.3.1] build-flavor: ["tf", "tflite"] models: ["test", "prod"] bitrate: ["8k", "16k"] @@ -2818,7 +2818,7 @@ jobs: strategy: matrix: arch: [ "armv7", "aarch64" ] - electronjs-version: [5.0.13, 6.1.7, 7.1.8, 8.0.1, 9.2.0, 10.1.0, 11.0.0, 12.0.0, , 13.6.1, 14.2.1, 15.3.1] + electronjs-version: [5.0.13, 6.1.7, 7.1.8, 8.0.1, 9.2.0, 10.1.0, 11.0.0, 12.0.0, 13.6.1, 14.2.1, 15.3.1] build-flavor: ["tflite"] models: ["test"] bitrate: ["16k"] From 230e1385e9474f3d32da58d864d99df72072a1ed Mon Sep 17 00:00:00 2001 From: Brian Robinson Date: Thu, 11 Nov 2021 20:23:20 -0700 Subject: [PATCH 6/6] Update versions in build steps --- .github/workflows/build-and-test.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index b6c78a8893..3c8317f179 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -394,7 +394,7 @@ jobs: - uses: ./.github/actions/node-build with: nodejs_versions: "10.0.0 11.0.0 12.7.0 13.0.0 14.0.0 15.0.0 16.0.0" - 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 9.2.0 10.0.0 10.1.0 11.0.0 12.0.0" + 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 9.2.0 10.0.0 10.1.0 11.0.0 12.0.0 13.6.1 14.2.1 15.3.1" - uses: actions/upload-artifact@v2 with: name: "nodewrapper-${{ matrix.build-flavor }}-Linux_amd64.tar.gz" @@ -938,7 +938,7 @@ jobs: - uses: ./.github/actions/node-build with: nodejs_versions: "10.0.0 11.0.0 12.7.0 13.0.0 14.0.0 15.0.0 16.0.0" - 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 9.2.0 10.0.0 10.1.0 11.0.0 12.0.0" + 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 9.2.0 10.0.0 10.1.0 11.0.0 12.0.0 13.6.1 14.2.1 15.3.1" - uses: actions/upload-artifact@v2 with: name: "nodewrapper-${{ matrix.build-flavor }}-macOS_amd64.tar.gz" @@ -1424,7 +1424,7 @@ jobs: - uses: ./.github/actions/node-build with: nodejs_versions: "10.0.0 11.0.0 12.7.0 13.0.0 14.0.0 15.0.0 16.0.0" - 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 9.2.0 10.0.0 10.1.0 11.0.0 12.0.0" + 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 9.2.0 10.0.0 10.1.0 11.0.0 12.0.0 13.6.1 14.2.1 15.3.1" - uses: actions/upload-artifact@v2 with: name: "nodewrapper-${{ matrix.build-flavor }}-Windows_amd64.tar.gz" @@ -2421,7 +2421,7 @@ jobs: - uses: ./.github/actions/node-build with: nodejs_versions: "10.0.0 11.0.0 12.7.0 13.0.0 14.0.0 15.0.0" - 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 9.2.0 10.0.0 10.1.0 11.0.0 12.0.0" + 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 9.2.0 10.0.0 10.1.0 11.0.0 12.0.0 13.6.1 14.2.1 15.3.1" target: ${{ env.SYSTEM_TARGET }} chroot: ${{ env.SYSTEM_RASPBIAN }} - uses: actions/upload-artifact@v2 @@ -2578,7 +2578,7 @@ jobs: - uses: ./.github/actions/node-build with: nodejs_versions: "10.0.0 11.0.0 12.7.0 13.0.0 14.0.0 15.0.0" - 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 9.2.0 10.0.0 10.1.0 11.0.0 12.0.0" + 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 9.2.0 10.0.0 10.1.0 11.0.0 12.0.0 13.6.1 14.2.1 15.3.1" target: ${{ env.SYSTEM_TARGET }} chroot: ${{ env.SYSTEM_RASPBIAN }} - uses: actions/upload-artifact@v2