diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-05-15 09:17:18 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-05-15 09:26:29 +0530 |
| commit | c3cbe2af94008099a5d7f77d466ab87a1a76530b (patch) | |
| tree | 17f37f511f648e0b83fa190f2ef166be9b0dcf66 | |
| parent | f2d0551941d4131b8a5b9d3320b27d1333b24034 (diff) | |
| download | meson-nirbheek/fix-macos-ci-pkgconfig-usage.tar.gz | |
travis/macos: Restore the old pkg-config behaviournirbheek/fix-macos-ci-pkgconfig-usage
We need to test both "have pkg-config" and "don't have pkg-config"
pathways on macOS, which is why pkg-config was only installed in one
branch based on --unity=on/off.
| -rwxr-xr-x | ci/travis_install.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ci/travis_install.sh b/ci/travis_install.sh index 5d191f1ca..281f6076f 100755 --- a/ci/travis_install.sh +++ b/ci/travis_install.sh @@ -7,9 +7,11 @@ msg() { echo -e "\x1b[1;32mINFO: \x1b[37m$*\x1b[0m"; } if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then msg "Running OSX setup" brew update + # Run one macOS build with pkg-config available (pulled in by qt), and the + # other (unity=on) without pkg-config brew install qt ldc llvm ninja if [[ "$MESON_ARGS" =~ .*unity=on.* ]]; then - which pkg-config || brew install pkg-config + which pkg-config && chmod -x `which pkg-config` fi python3 -m pip install jsonschema elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then |