From dde09757d4858fc4c141024dd74cea75465afab0 Mon Sep 17 00:00:00 2001
From: Alexandre Lissy <lissyx@lissyx.dyndns.org>
Date: Sun, 24 Nov 2019 14:23:35 +0100
Subject: [PATCH] Support ElectronJS v7.1.2

Fixes #2543
---
 taskcluster/tc-tests-utils.sh                      |  2 +-
 .../test-electronjs_v7.1-darwin-amd64-opt.yml      | 13 +++++++++++++
 .../test-electronjs_v7.1-linux-amd64-opt.yml       | 14 ++++++++++++++
 taskcluster/test-electronjs_v7.1-win-amd64-opt.yml | 13 +++++++++++++
 4 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 taskcluster/test-electronjs_v7.1-darwin-amd64-opt.yml
 create mode 100644 taskcluster/test-electronjs_v7.1-linux-amd64-opt.yml
 create mode 100644 taskcluster/test-electronjs_v7.1-win-amd64-opt.yml

diff --git a/taskcluster/tc-tests-utils.sh b/taskcluster/tc-tests-utils.sh
index 8a55acfd..570a5cf7 100755
--- a/taskcluster/tc-tests-utils.sh
+++ b/taskcluster/tc-tests-utils.sh
@@ -57,7 +57,7 @@ model_source_mmap="$(dirname "${model_source}")/${model_name_mmap}"
 
 SUPPORTED_PYTHON_VERSIONS=${SUPPORTED_PYTHON_VERSIONS:-2.7.16:ucs2 2.7.16:ucs4 3.4.10:ucs4 3.5.7:ucs4 3.6.8:ucs4 3.7.3:ucs4 3.8.0:ucs4}
 SUPPORTED_NODEJS_VERSIONS=${SUPPORTED_NODEJS_VERSIONS:-4.9.1 5.12.0 6.17.1 7.10.1 8.16.0 9.11.2 10.16.0 11.15.0 12.5.0 13.0.1}
-SUPPORTED_ELECTRONJS_VERSIONS=${SUPPORTED_ELECTRONJS_VERSIONS:-1.6.18 1.7.16 1.8.8 2.0.18 3.0.16 3.1.11 4.0.3 4.1.5 4.2.5 5.0.6 6.0.11 7.0.1}
+SUPPORTED_ELECTRONJS_VERSIONS=${SUPPORTED_ELECTRONJS_VERSIONS:-1.6.18 1.7.16 1.8.8 2.0.18 3.0.16 3.1.11 4.0.3 4.1.5 4.2.5 5.0.6 6.0.11 7.0.1 7.1.2}
 
 strip() {
   echo "$(echo $1 | sed -e 's/^[[:space:]]+//' -e 's/[[:space:]]+$//')"
diff --git a/taskcluster/test-electronjs_v7.1-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v7.1-darwin-amd64-opt.yml
new file mode 100644
index 00000000..1d876489
--- /dev/null
+++ b/taskcluster/test-electronjs_v7.1-darwin-amd64-opt.yml
@@ -0,0 +1,13 @@
+build:
+  template_file: test-darwin-opt-base.tyml
+  dependencies:
+    - "darwin-amd64-cpu-opt"
+    - "test-training_upstream-linux-amd64-py35m-opt"
+  system_setup:
+    >
+      ${nodejs.brew.setup} && ${nodejs.brew.prep_12} && ${nodejs.brew.env}
+  args:
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.1.2"
+  metadata:
+    name: "DeepSpeech OSX AMD64 CPU ElectronJS v7.1 tests"
+    description: "Testing DeepSpeech for OSX/AMD64 on ElectronJS v7.1, CPU only, optimized version"
diff --git a/taskcluster/test-electronjs_v7.1-linux-amd64-opt.yml b/taskcluster/test-electronjs_v7.1-linux-amd64-opt.yml
new file mode 100644
index 00000000..27a6a994
--- /dev/null
+++ b/taskcluster/test-electronjs_v7.1-linux-amd64-opt.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  docker_image: "ubuntu:16.04"
+  dependencies:
+    - "linux-amd64-cpu-opt"
+    - "test-training_upstream-linux-amd64-py35m-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 7.1.2"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v7.1 tests"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v7.1, CPU only, optimized version"
diff --git a/taskcluster/test-electronjs_v7.1-win-amd64-opt.yml b/taskcluster/test-electronjs_v7.1-win-amd64-opt.yml
new file mode 100644
index 00000000..72e0cad0
--- /dev/null
+++ b/taskcluster/test-electronjs_v7.1-win-amd64-opt.yml
@@ -0,0 +1,13 @@
+build:
+  template_file: test-win-opt-base.tyml
+  dependencies:
+    - "win-amd64-cpu-opt"
+    - "test-training_upstream-linux-amd64-py35m-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 7.1.2"
+  metadata:
+    name: "DeepSpeech Windows AMD64 CPU ElectronJS v7.1 tests"
+    description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS v7.1, CPU only, optimized version"