From ff5d58b2810bffd5caef5c59446e315aff100358 Mon Sep 17 00:00:00 2001
From: Alexandre Lissy <lissyx@lissyx.dyndns.org>
Date: Tue, 11 Dec 2018 13:34:57 +0100
Subject: [PATCH] Split package upload

---
 ...-task.yml => scriptworker-task-github.yml} | 10 ++++---
 taskcluster/scriptworker-task-npm.yml         | 25 ++++++++++++++++
 taskcluster/scriptworker-task-pypi.yml        | 29 +++++++++++++++++++
 3 files changed, 60 insertions(+), 4 deletions(-)
 rename taskcluster/{scriptworker-task.yml => scriptworker-task-github.yml} (76%)
 create mode 100644 taskcluster/scriptworker-task-npm.yml
 create mode 100644 taskcluster/scriptworker-task-pypi.yml

diff --git a/taskcluster/scriptworker-task.yml b/taskcluster/scriptworker-task-github.yml
similarity index 76%
rename from taskcluster/scriptworker-task.yml
rename to taskcluster/scriptworker-task-github.yml
index a7949636..bea123bf 100644
--- a/taskcluster/scriptworker-task.yml
+++ b/taskcluster/scriptworker-task-github.yml
@@ -2,7 +2,7 @@ build:
   template_file: simple-task.tyml
   dependencies:
     # Make sure builds are ready
-    # - "linux-arm64-cpu-opt" Aarch64 packages are refused by upload.pypi.org
+    - "linux-arm64-cpu-opt"
     - "darwin-amd64-cpu-opt"
     - "linux-amd64-cpu-opt"
     - "linux-amd64-gpu-opt"
@@ -14,13 +14,15 @@ build:
   routes:
     - "notify.irc-channel.${notifications.irc}.on-exception"
     - "notify.irc-channel.${notifications.irc}.on-failed"
+  upload_targets:
+      - "github"
   artifacts_deps:
     python:
       - "darwin-amd64-cpu-opt"
       - "linux-amd64-cpu-opt"
       - "linux-amd64-gpu-opt"
       - "linux-rpi3-cpu-opt"
-      # - "linux-arm64-cpu-opt" Aarch64 packages are refused by upload.pypi.org
+      - "linux-arm64-cpu-opt"
     javascript:
       # GPU package
       - "linux-amd64-gpu-opt"
@@ -33,5 +35,5 @@ build:
       - "linux-rpi3-cpu-opt"
       - "linux-arm64-cpu-opt"
   metadata:
-    name: "DeepSpeech Packages"
-    description: "Trigger Uploading of DeepSpeech Packages to the Internets"
+    name: "DeepSpeech GitHub Packages"
+    description: "Trigger Uploading of DeepSpeech Packages to GitHub release page"
diff --git a/taskcluster/scriptworker-task-npm.yml b/taskcluster/scriptworker-task-npm.yml
new file mode 100644
index 00000000..3e704725
--- /dev/null
+++ b/taskcluster/scriptworker-task-npm.yml
@@ -0,0 +1,25 @@
+build:
+  template_file: simple-task.tyml
+  dependencies:
+    # Make sure builds are ready
+    - "linux-amd64-gpu-opt"
+    - "node-package"
+  allowed:
+    - "tag"
+  ref_match: "refs/tags/"
+  routes:
+    - "notify.irc-channel.${notifications.irc}.on-exception"
+    - "notify.irc-channel.${notifications.irc}.on-failed"
+  upload_targets:
+      - "npm"
+  artifacts_deps:
+    python: []
+    cpp: []
+    javascript:
+      # GPU package
+      - "linux-amd64-gpu-opt"
+      # CPU package with all archs
+      - "node-package"
+  metadata:
+    name: "DeepSpeech NPM Packages"
+    description: "Trigger Uploading of DeepSpeech Packages to NPM registry"
diff --git a/taskcluster/scriptworker-task-pypi.yml b/taskcluster/scriptworker-task-pypi.yml
new file mode 100644
index 00000000..07d5d1ae
--- /dev/null
+++ b/taskcluster/scriptworker-task-pypi.yml
@@ -0,0 +1,29 @@
+build:
+  template_file: simple-task.tyml
+  dependencies:
+    # Make sure builds are ready
+    # - "linux-arm64-cpu-opt" Aarch64 packages are refused by upload.pypi.org
+    - "darwin-amd64-cpu-opt"
+    - "linux-amd64-cpu-opt"
+    - "linux-amd64-gpu-opt"
+    - "linux-rpi3-cpu-opt"
+  allowed:
+    - "tag"
+  ref_match: "refs/tags/"
+  routes:
+    - "notify.irc-channel.${notifications.irc}.on-exception"
+    - "notify.irc-channel.${notifications.irc}.on-failed"
+  upload_targets:
+      - "pypi"
+  artifacts_deps:
+    javascript: []
+    cpp: []
+    python:
+      - "darwin-amd64-cpu-opt"
+      - "linux-amd64-cpu-opt"
+      - "linux-amd64-gpu-opt"
+      - "linux-rpi3-cpu-opt"
+      # - "linux-arm64-cpu-opt" Aarch64 packages are refused by upload.pypi.org
+  metadata:
+    name: "DeepSpeech PyPi Packages"
+    description: "Trigger Uploading of DeepSpeech Packages to PyPi"