Merge pull request #3267 from lissyx/electronjs-r0.8

lissyx · web-flow · commit c9bd96f78c5e · 2020-08-20T12:43:02.000+02:00
Add ElectronJS v9.2
diff --git 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 9.1.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}
diff --git a/taskcluster/test-electronjs_v9.1-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v9.1-darwin-amd64-opt.yml
@@ -9,7 +9,7 @@ build:
     >
       ${nodejs.brew.prep_12}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 9.0.1 16k"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 9.1.0 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
@@ -8,7 +8,7 @@ build:
     >
       ${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"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 9.1.0 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
@@ -9,7 +9,7 @@ build:
     >
       ${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"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 9.1.0 16k"
   workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU ElectronJS v9.1 tests (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
@@ -9,7 +9,7 @@ build:
     >
       ${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"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 9.1.0 8k"
   workerType: "${docker.dsTests}"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU ElectronJS v9.1 tests (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
@@ -8,7 +8,7 @@ build:
     >
       ${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"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 9.1.0 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
@@ -8,7 +8,7 @@ build:
     >
       ${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"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 9.1.0 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
@@ -8,7 +8,7 @@ build:
     >
       ${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"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron_tflite-tests.sh 12.x 9.1.0 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"
diff --git a/taskcluster/test-electronjs_v9.2-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v9.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 9.2.0 16k"
+  metadata:
+    name: "Mozilla Voice STT OSX AMD64 CPU ElectronJS v9.2 tests"
+    description: "Testing Mozilla Voice STT for OSX/AMD64 on ElectronJS v9.2, CPU only, optimized version"
diff --git a/taskcluster/test-electronjs_v9.2-win-amd64-opt.yml b/taskcluster/test-electronjs_v9.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 9.2.0 16k"
+  metadata:
+    name: "Mozilla Voice STT Windows AMD64 CPU ElectronJS v9.2 tests"
+    description: "Testing Mozilla Voice STT for Windows/AMD64 on ElectronJS v9.2, CPU only, optimized version"
diff --git a/taskcluster/test-electronjs_v9.2_16k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v9.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 9.2.0 16k"
+  workerType: "${docker.dsTests}"
+  metadata:
+    name: "Mozilla Voice STT Linux AMD64 CPU ElectronJS v9.2 tests (16kHz)"
+    description: "Testing Mozilla Voice STT for Linux/AMD64 on ElectronJS v9.2, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-electronjs_v9.2_8k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v9.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 9.2.0 8k"
+  workerType: "${docker.dsTests}"
+  metadata:
+    name: "Mozilla Voice STT Linux AMD64 CPU ElectronJS v9.2 tests (8kHz)"
+    description: "Testing Mozilla Voice STT for Linux/AMD64 on ElectronJS v9.2, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-electronjs_v9.2_multiarchpkg-win-amd64-opt.yml b/taskcluster/test-electronjs_v9.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 9.2.0 16k"
+  metadata:
+    name: "Mozilla Voice STT Windows AMD64 CPU ElectronJS MultiArch Package v9.2 tests"
+    description: "Testing Mozilla Voice STT for Windows/AMD64 on ElectronJS MultiArch Package v9.2, CPU only, optimized version"
diff --git a/taskcluster/test-electronjs_v9.2_multiarchpkg-win-cuda-opt.yml b/taskcluster/test-electronjs_v9.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 9.2.0 16k cuda"
+  metadata:
+    name: "Mozilla Voice STT Windows AMD64 CUDA ElectronJS MultiArch Package v9.2 tests"
+    description: "Testing Mozilla Voice STT for Windows/AMD64 on ElectronJS MultiArch Package v9.2, CUDA, optimized version"
diff --git a/taskcluster/test-electronjs_v9.2_multiarchpkg-win-tflite-opt.yml b/taskcluster/test-electronjs_v9.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 9.2.0 16k"
+  metadata:
+    name: "Mozilla Voice STT Windows AMD64 TFLite ElectronJS MultiArch Package v9.2 tests"
+    description: "Testing Mozilla Voice STT for Windows/AMD64 on ElectronJS MultiArch Package v9.2, TFLite only, optimized version"

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ build:`
`9`	`9`	`>`
`10`	`10`	`${nodejs.brew.prep_12}`
`11`	`11`	`args:`
`12`		`- tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 9.0.1 16k"`
	`12`	`+ tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 9.1.0 16k"`
`13`	`13`	`metadata:`
`14`	`14`	`name: "DeepSpeech OSX AMD64 CPU ElectronJS v9.1 tests"`
`15`	`15`	`description: "Testing DeepSpeech for OSX/AMD64 on ElectronJS v9.1, CPU only, optimized version"`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ build:`
`8`	`8`	`>`
`9`	`9`	`${system.sox_win} && ${nodejs.win.prep_12}`
`10`	`10`	`args:`
`11`		`- tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 9.0.1 16k"`
	`11`	`+ tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 9.1.0 16k"`
`12`	`12`	`metadata:`
`13`	`13`	`name: "DeepSpeech Windows AMD64 CPU ElectronJS v9.1 tests"`
`14`	`14`	`description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS v9.1, CPU only, optimized version"`