From 318d5b94676ac6c07c66d981d104c802671026e2 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Wed, 31 Jan 2018 09:48:58 -0500
Subject: [PATCH 1/2] Share linux build env with doc build.

---
 buildbot/master/files/config/environments.py | 32 ++++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/buildbot/master/files/config/environments.py b/buildbot/master/files/config/environments.py
index 4ab31074..25b151c5 100644
--- a/buildbot/master/files/config/environments.py
+++ b/buildbot/master/files/config/environments.py
@@ -41,11 +41,23 @@ def without(self, to_unset):
                 modified.pop(env_var)
         return modified
 
-
-doc = Environment({
+build_linux_common = Environment({
     'CARGO_HOME': '{{ common.servo_home }}/.cargo',
-    'SERVO_CACHE_DIR': '{{ common.servo_home }}/.servo',
+    'PATH': ':'.join([
+        '{{ common.servo_home }}/.cargo/bin',
+        '{{ common.servo_home }}/bin',
+        '/usr/local/sbin',
+        '/usr/local/bin',
+        '/usr/bin',
+        '/usr/sbin',
+        '/sbin',
+        '/bin',
+    ]),
     'SHELL': '/bin/bash',
+})
+    
+doc = build_linux_common + Environment({
+    'SERVO_CACHE_DIR': '{{ common.servo_home }}/.servo',
     'TOKEN': GITHUB_DOC_TOKEN,
 })
 
@@ -88,22 +100,10 @@ def without(self, to_unset):
 })
 
 
-build_linux = build_common + Environment({
-    'CARGO_HOME': '{{ common.servo_home }}/.cargo',
+build_linux = build_common + build_linux_common + Environment({
     'CCACHE': '/usr/bin/ccache',
     'DISPLAY': ':0',
     'SERVO_CACHE_DIR': '{{ common.servo_home }}/.servo',
-    'SHELL': '/bin/bash',
-    'PATH': ':'.join([
-        '{{ common.servo_home }}/.cargo/bin',
-        '{{ common.servo_home }}/bin',
-        '/usr/local/sbin',
-        '/usr/local/bin',
-        '/usr/bin',
-        '/usr/sbin',
-        '/sbin',
-        '/bin',
-    ]),
 })
 
 build_android = build_linux + Environment({

From 942a22139471e82ce5f4813566a59d6c7c191ef2 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Wed, 31 Jan 2018 10:33:00 -0500
Subject: [PATCH 2/2] Whitespace fixes.

---
 buildbot/master/files/config/environments.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/buildbot/master/files/config/environments.py b/buildbot/master/files/config/environments.py
index 25b151c5..b4d1bbf6 100644
--- a/buildbot/master/files/config/environments.py
+++ b/buildbot/master/files/config/environments.py
@@ -41,6 +41,7 @@ def without(self, to_unset):
                 modified.pop(env_var)
         return modified
 
+
 build_linux_common = Environment({
     'CARGO_HOME': '{{ common.servo_home }}/.cargo',
     'PATH': ':'.join([
@@ -55,7 +56,7 @@ def without(self, to_unset):
     ]),
     'SHELL': '/bin/bash',
 })
-    
+
 doc = build_linux_common + Environment({
     'SERVO_CACHE_DIR': '{{ common.servo_home }}/.servo',
     'TOKEN': GITHUB_DOC_TOKEN,