diff mbox series

[v1,14/14] .travis.yml: drop MacOSX

Message ID 20200423170557.31106-15-alex.bennee@linaro.org
State Superseded
Headers show
Series guest_base, gdbstub and Travis | expand

Commit Message

Alex Bennée April 23, 2020, 5:05 p.m. UTC
This keeps breaking on Travis so lets just fall back to the Cirrus CI
builds which seem to be better maintained. Fix up the comments while
we are doing this as we never had a windows build.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

---
 .travis.yml | 28 +---------------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

-- 
2.20.1

Comments

Philippe Mathieu-Daudé April 23, 2020, 8:28 p.m. UTC | #1
On 4/23/20 7:05 PM, Alex Bennée wrote:
> This keeps breaking on Travis so lets just fall back to the Cirrus CI

> builds which seem to be better maintained. Fix up the comments while

> we are doing this as we never had a windows build.


I certainly vouch this.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>


> 

> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

> ---

>   .travis.yml | 28 +---------------------------

>   1 file changed, 1 insertion(+), 27 deletions(-)

> 

> diff --git a/.travis.yml b/.travis.yml

> index a4c3c6c805..49267b73b3 100644

> --- a/.travis.yml

> +++ b/.travis.yml

> @@ -9,9 +9,8 @@ compiler:

>   cache:

>     # There is one cache per branch and compiler version.

>     # characteristics of each job are used to identify the cache:

> -  # - OS name (currently, linux, osx, or windows)

> +  # - OS name (currently only linux)

>     # - OS distribution (for Linux, xenial, trusty, or precise)

> -  # - macOS image name (e.g., xcode7.2)

>     # - Names and values of visible environment variables set in .travis.yml or Settings panel

>     timeout: 1200

>     ccache: true

> @@ -271,31 +270,6 @@ jobs:

>           - TEST_CMD=""

>   

>   

> -    # MacOSX builds - cirrus.yml also tests some MacOS builds including latest Xcode

> -

> -    - name: "OSX Xcode 10.3"

> -      env:

> -        - BASE_CONFIG="--disable-docs --enable-tools"

> -        - CONFIG="--target-list=i386-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,x86_64-softmmu"

> -      os: osx

> -      osx_image: xcode10.3

> -      compiler: clang

> -      addons:

> -        homebrew:

> -          packages:

> -            - ccache

> -            - glib

> -            - pixman

> -            - gnu-sed

> -            - python

> -          update: true

> -      before_script:

> -        - brew link --overwrite python

> -        - export PATH="/usr/local/opt/ccache/libexec:$PATH"

> -        - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}

> -        - ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.log && exit 1; }

> -

> -

>       # Python builds

>       - name: "GCC Python 3.5 (x86_64-softmmu)"

>         env:

>
diff mbox series

Patch

diff --git a/.travis.yml b/.travis.yml
index a4c3c6c805..49267b73b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,9 +9,8 @@  compiler:
 cache:
   # There is one cache per branch and compiler version.
   # characteristics of each job are used to identify the cache:
-  # - OS name (currently, linux, osx, or windows)
+  # - OS name (currently only linux)
   # - OS distribution (for Linux, xenial, trusty, or precise)
-  # - macOS image name (e.g., xcode7.2)
   # - Names and values of visible environment variables set in .travis.yml or Settings panel
   timeout: 1200
   ccache: true
@@ -271,31 +270,6 @@  jobs:
         - TEST_CMD=""
 
 
-    # MacOSX builds - cirrus.yml also tests some MacOS builds including latest Xcode
-
-    - name: "OSX Xcode 10.3"
-      env:
-        - BASE_CONFIG="--disable-docs --enable-tools"
-        - CONFIG="--target-list=i386-softmmu,ppc-softmmu,ppc64-softmmu,m68k-softmmu,x86_64-softmmu"
-      os: osx
-      osx_image: xcode10.3
-      compiler: clang
-      addons:
-        homebrew:
-          packages:
-            - ccache
-            - glib
-            - pixman
-            - gnu-sed
-            - python
-          update: true
-      before_script:
-        - brew link --overwrite python
-        - export PATH="/usr/local/opt/ccache/libexec:$PATH"
-        - mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
-        - ${SRC_DIR}/configure ${BASE_CONFIG} ${CONFIG} || { cat config.log && exit 1; }
-
-
     # Python builds
     - name: "GCC Python 3.5 (x86_64-softmmu)"
       env: