Bug 1544981 - Stop tapping caskroom/versions in bootstrap for macOS r=nalexander
authorRob Wu <rob@robwu.nl>
Thu, 18 Apr 2019 18:39:31 +0000
changeset 470051 74dc09642c222e18634f4f13e7b0bd6b7f91cbc2
parent 470050 818371a9ab702e2e7320c5c62cc1dff8f5534c0c
child 470052 b44914767f72367a7e4b01c9fd0ba9258c41570c
child 470059 00719f1766c13085d3d7685444fa64d41eb8555b
push id112839
push userapavel@mozilla.com
push dateThu, 18 Apr 2019 21:50:57 +0000
treeherdermozilla-inbound@e0a826fcd85b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1544981
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1544981 - Stop tapping caskroom/versions in bootstrap for macOS r=nalexander `caskroom/versions` was replaced with `homebrew/cask-versions` in 2018. Tap `caskroom/versions` instead of the old one. If you have two taps, remove the old one using: brew untap caskroom/versions Differential Revision: https://phabricator.services.mozilla.com/D27839
python/mozboot/mozboot/osx.py
--- a/python/mozboot/mozboot/osx.py
+++ b/python/mozboot/mozboot/osx.py
@@ -316,17 +316,17 @@ class OSXBootstrapper(BaseBootstrapper):
 
         return printed
 
     def _ensure_homebrew_casks(self, casks):
         self._ensure_homebrew_found()
 
         # Ensure that we can access old versions of packages.  This is
         # idempotent, so no need to avoid repeat invocation.
-        self.check_output([self.brew, 'tap', 'caskroom/versions'])
+        self.check_output([self.brew, 'tap', 'homebrew/cask-versions'])
 
         # Change |brew install cask| into |brew cask install cask|.
         return self._ensure_homebrew_packages(casks, extra_brew_args=['cask'])
 
     def ensure_homebrew_system_packages(self):
         # We need to install Python because Mercurial requires the
         # Python development headers which are missing from OS X (at
         # least on 10.8) and because the build system wants a version
@@ -383,17 +383,17 @@ class OSXBootstrapper(BaseBootstrapper):
         self.ensure_java()
         from mozboot import android
 
         android.ensure_android('macosx', artifact_mode=artifact_mode,
                                no_interactive=self.no_interactive)
 
     def suggest_homebrew_mobile_android_mozconfig(self, artifact_mode=False):
         from mozboot import android
-        # Path to java from the caskroom/versions/java8 cask.
+        # Path to java from the homebrew/cask-versions/java8 cask.
         android.suggest_mozconfig('macosx', artifact_mode=artifact_mode,
                                   java_bin_path='/Library/Java/Home/bin')
 
     def _ensure_macports_packages(self, packages):
         self.port = self.which('port')
         assert self.port is not None
 
         installed = set(self.check_output([self.port, 'installed']).split())