From d76de1d6047a0e2234bd190af1de2e4197d75bfe Mon Sep 17 00:00:00 2001
From: Paul Rouget <me@paulrouget.com>
Date: Tue, 16 Aug 2016 06:20:27 +0200
Subject: [PATCH] Add brew scripts to nightly

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

diff --git a/buildbot/master/files/config/environments.py b/buildbot/master/files/config/environments.py
index de93b597..d8c427ff 100644
--- a/buildbot/master/files/config/environments.py
+++ b/buildbot/master/files/config/environments.py
@@ -1,6 +1,6 @@
 import copy
 
-from passwords import GITHUB_DOC_TOKEN
+from passwords import GITHUB_DOC_TOKEN, GITHUB_HOMEBREW_TOKEN
 from passwords import S3_UPLOAD_ACCESS_KEY_ID, S3_UPLOAD_SECRET_ACCESS_KEY
 
 
@@ -136,4 +136,5 @@ def without(self, to_unset):
 upload_nightly = Environment({
     'AWS_ACCESS_KEY_ID': S3_UPLOAD_ACCESS_KEY_ID,
     'AWS_SECRET_ACCESS_KEY': S3_UPLOAD_SECRET_ACCESS_KEY,
+    'TOKEN': GITHUB_HOMEBREW_TOKEN,
 })
diff --git a/buildbot/master/files/config/passwords.py b/buildbot/master/files/config/passwords.py
index 495aedf8..3ebcf242 100644
--- a/buildbot/master/files/config/passwords.py
+++ b/buildbot/master/files/config/passwords.py
@@ -3,6 +3,7 @@
 SLAVE_PASSWORD = "{{ buildbot_credentials['slave-pass'] }}"
 CHANGE_PASSWORD = "{{ buildbot_credentials['change-pass'] }}"
 GITHUB_DOC_TOKEN = "{{ buildbot_credentials['gh-doc-token'] }}"
+GITHUB_HOMEBREW_TOKEN = "{{ buildbot_credentials['gh-homebrew-token'] }}"
 HOMU_BUILDBOT_SECRET = "{{ buildbot_credentials['homu-secret'] }}"
 S3_UPLOAD_ACCESS_KEY_ID = \
     "{{ buildbot_credentials['s3-upload-access-key-id'] }}"
diff --git a/buildbot/master/files/config/steps.yml b/buildbot/master/files/config/steps.yml
index bae9ac67..2ebb313f 100644
--- a/buildbot/master/files/config/steps.yml
+++ b/buildbot/master/files/config/steps.yml
@@ -26,6 +26,8 @@ mac-nightly:
   - ./mach build --release
   - ./mach package --release
   - ./etc/ci/upload_nightly.sh mac
+  - ./etc/ci/upload_nightly.sh macbrew
+  - ./etc/ci/update_brew.sh
 
 linux-dev:
   - ./mach test-tidy --no-progress --all