From e7751d8d235eee4955f7636df460a3814455d61b Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Thu, 16 May 2019 16:52:18 -0400
Subject: [PATCH 1/4] Make net.generic.worker a LaunchDaemon

---
 etc/taskcluster/macos/states/generic-worker.sls | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/etc/taskcluster/macos/states/generic-worker.sls b/etc/taskcluster/macos/states/generic-worker.sls
index 0c3db51254f..4f2f9b8e65f 100644
--- a/etc/taskcluster/macos/states/generic-worker.sls
+++ b/etc/taskcluster/macos/states/generic-worker.sls
@@ -13,6 +13,8 @@ GMT:
     - source_hash: sha256=817e72972a7c077f1a829d5824e5c0e831eb6f9b254672e7427246a8dd476a59
     - mode: 755
     - makedirs: True
+    - watch_in:
+      - service: net.generic.worker
 
 {{ bin }}/livelog:
   file.managed:
@@ -20,6 +22,8 @@ GMT:
     - source_hash: sha256=be5d4b998b208afd802ac6ce6c4d4bbf0fb3816bb039a300626abbc999dfe163
     - mode: 755
     - makedirs: True
+    - watch_in:
+      - service: net.generic.worker
 
 {{ bin }}/taskcluster-proxy:
   file.managed:
@@ -27,6 +31,8 @@ GMT:
     - source_hash: sha256=3faf524b9c6b9611339510797bf1013d4274e9f03e7c4bd47e9ab5ec8813d3ae
     - mode: 755
     - makedirs: True
+    - watch_in:
+      - service: net.generic.worker
 
 {{ user }} group:
   group.present:
@@ -73,7 +79,7 @@ GMT:
     - creates: {{ home }}/keypair
     - runas: {{ user }}
 
-/Library/LaunchAgents/net.generic.worker.plist:
+/Library/LaunchDaemons/net.generic.worker.plist:
   file.managed:
     - mode: 600
     - user: root
@@ -84,6 +90,11 @@ GMT:
       etc: {{ etc }}
       home: {{ home }}
       username: {{ user }}
+    - watch_in:
+      - service: net.generic.worker
+
+/Library/LaunchDaemons/net.generic.worker.plist:
+  file.absent: []
 
 net.generic.worker:
   service.running:

From 1505c9cfc93e7debc85162f231fe3184e0020e19 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Thu, 16 May 2019 16:53:23 -0400
Subject: [PATCH 2/4] Remove old service plist.

---
 etc/taskcluster/macos/states/generic-worker.sls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/taskcluster/macos/states/generic-worker.sls b/etc/taskcluster/macos/states/generic-worker.sls
index 4f2f9b8e65f..07b8954774f 100644
--- a/etc/taskcluster/macos/states/generic-worker.sls
+++ b/etc/taskcluster/macos/states/generic-worker.sls
@@ -93,7 +93,7 @@ GMT:
     - watch_in:
       - service: net.generic.worker
 
-/Library/LaunchDaemons/net.generic.worker.plist:
+/Library/LaunchAgents/net.generic.worker.plist:
   file.absent: []
 
 net.generic.worker:

From 9098e6a51a666c348db4d9677b5b426edda76ca6 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Thu, 16 May 2019 16:59:23 -0400
Subject: [PATCH 3/4] Improve dependencies for generic-worker deployment.

---
 etc/taskcluster/macos/states/generic-worker.sls | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/etc/taskcluster/macos/states/generic-worker.sls b/etc/taskcluster/macos/states/generic-worker.sls
index 07b8954774f..007a28665cd 100644
--- a/etc/taskcluster/macos/states/generic-worker.sls
+++ b/etc/taskcluster/macos/states/generic-worker.sls
@@ -79,8 +79,12 @@ GMT:
     - creates: {{ home }}/keypair
     - runas: {{ user }}
 
-/Library/LaunchDaemons/net.generic.worker.plist:
+/Library/LaunchAgents/net.generic.worker.plist:
+  file.absent: []
+
+net.generic.worker:
   file.managed:
+    - name: /Library/LaunchDaemons/net.generic.worker.plist
     - mode: 600
     - user: root
     - template: jinja
@@ -90,12 +94,7 @@ GMT:
       etc: {{ etc }}
       home: {{ home }}
       username: {{ user }}
-    - watch_in:
-      - service: net.generic.worker
-
-/Library/LaunchAgents/net.generic.worker.plist:
-  file.absent: []
-
-net.generic.worker:
   service.running:
     - enable: True
+    - watch:
+      - file: /Library/LaunchDaemons/net.generic.worker.plist

From 409167d7c5012e75b0fec3b402914ff946257726 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Fri, 17 May 2019 16:25:29 -0400
Subject: [PATCH 4/4] Add useful debugging output for macos builds.

---
 etc/taskcluster/decision_task.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py
index 0915639ae5a..076aea31413 100644
--- a/etc/taskcluster/decision_task.py
+++ b/etc/taskcluster/decision_task.py
@@ -228,7 +228,7 @@ def macos_unit():
         macos_build_task("Dev build + unit tests")
         .with_treeherder("macOS x64", "Unit")
         .with_script("""
-            ./mach build --dev
+            ./mach build --dev --verbose
             ./mach test-unit
             ./mach package --dev
             ./etc/ci/lockfile_changed.sh
@@ -264,7 +264,7 @@ def android_arm32_dev_from_macos():
             export HOST_CC="$(brew --prefix llvm)/bin/clang"
             export HOST_CXX="$(brew --prefix llvm)/bin/clang++"
             ./mach bootstrap-android --accept-all-licences --build
-            ./mach build --android --dev
+            ./mach build --android --dev --verbose
         """)
         .find_or_create("android_arm32_dev.macos." + CONFIG.git_sha)
     )
@@ -509,7 +509,7 @@ def macos_wpt():
         macos_build_task("Release build")
         .with_treeherder("macOS x64", "Release")
         .with_script("""
-            ./mach build --release
+            ./mach build --release --verbose
             ./etc/ci/lockfile_changed.sh
             tar -czf target.tar.gz \
                 target/release/servo \