Skip to content

Commit

Permalink
Rollup merge of rust-lang#63106 - alexcrichton:remove-swig-osx, r=pie…
Browse files Browse the repository at this point in the history
…troalbini

ci: Skip installing SWIG/xz on OSX

I'm relatively certain that SWIG was only needed for LLDB which is no
longer built, and I'm hoping we can remove the xz install to remove the
reliance on `brew` for our build (which is another point of failure for
flaky networks).
  • Loading branch information
Centril authored Jul 30, 2019
2 parents bccaf45 + 60680d4 commit 4282391
Showing 1 changed file with 0 additions and 11 deletions.
11 changes: 0 additions & 11 deletions .azure-pipelines/steps/run.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,6 @@ steps:
- template: install-sccache.yml
- template: install-clang.yml

# Install some dependencies needed to build LLDB/Clang, currently only needed
# during the `dist` target
- bash: |
set -e
brew update
brew install xz
brew install swig@3
brew link --force swig@3
displayName: Install build dependencies (OSX)
condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'), eq(variables['SCRIPT'],'./x.py dist'))

# Switch to XCode 9.3 on OSX since it seems to be the last version that supports
# i686-apple-darwin. We'll eventually want to upgrade this and it will probably
# force us to drop i686-apple-darwin, but let's keep the wheels turning for now.
Expand Down

0 comments on commit 4282391

Please sign in to comment.