]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
travis: Bump Xcode 10 image to 10.2
authorPhilippe Mathieu-Daudé <philmd@redhat.com>
Wed, 20 Feb 2019 19:35:41 +0000 (20:35 +0100)
committerAlex Bennée <alex.bennee@linaro.org>
Tue, 12 Mar 2019 17:05:21 +0000 (17:05 +0000)
Travis enforce the use of the git protocol v2 on their images,
but the 'xcode10' image doesn't handle this correctly, resulting
in the brew packages installation failing:

  $ git config protocol.version
  2
  $ rvm $brew_ruby do brew bundle --verbose --global
  /usr/local/bin/brew tap homebrew/bundle
  ==> Tapping homebrew/bundle
  Cloning into '/usr/local/Homebrew/Library/Taps/homebrew/homebrew-bundle'...
  fatal: unknown value for config 'protocol.version': 2
  Error: Failure while executing; `git clone https://github.com/Homebrew/homebrew-bundle /usr/local/Homebrew/Library/Taps/homebrew/homebrew-bundle --depth=1` exited with 128.
  Error: Failure while executing; `/usr/local/bin/brew tap homebrew/bundle` exited with 1.

The newer 'xcode10.2' beta [*] image doesn't have this limitation.

This image comes with the following brew packages pre-installed,
which extend the current code coverage:
 - libffi
 - libpng
 - libtasn1
 - gnutls
 - jpeg
 - nettle

[*] https://blog.travis-ci.com/2019-02-12-xcode-10-2-beta-2-is-now-available

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190220193541.24419-1-philmd@redhat.com>
[AJB: re-enabled MacOS build first]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
.travis.yml

index e942175dd30cb4d27a698e4d1c3f7e86de992ff4..ecaea976509d79a7e190fe941144fa350874bb94 100644 (file)
@@ -185,6 +185,13 @@ matrix:
       compiler: clang
 
 
+    - env:
+        - CONFIG="--target-list=i386-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,x86_64-softmmu"
+      os: osx
+      osx_image: xcode10.2
+      compiler: clang
+
+
     # Python builds
     - env:
         - CONFIG="--target-list=x86_64-softmmu"