X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=.travis.yml;h=e35aff394b999f0cf6e54797c3cbb5bee1a0d029;hp=795c0fce6bfe8d5bc62839e67e2397aed9550292;hb=48ff7df9daea86c82a572b0a840bb8371b6b1a29;hpb=d30455b5f301b9c8017a0c7439573835d7e177de

diff --git a/.travis.yml b/.travis.yml
index 795c0fce..e35aff39 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,30 +1,37 @@
 language: c
+dist: bionic
 os:
   - linux
 compiler:
   - clang
   - gcc
+arch:
+  - amd64
+  - arm64
 env:
   global:
     - MAKEFLAGS="-j 2"
 matrix:
   include:
+    - os: linux
+      compiler: gcc
+      arch: amd64
+      env: BUILD_ARCH="x86" # Only do the gcc x86 build to reduce clutter
+    # Default xcode image
     - os: osx
       compiler: clang # Workaround travis setting CC=["clang", "gcc"]
-    # Build using the 10.12 SDK but target and run on OSX 10.11
-#   - os: osx
-#     compiler: clang
-#     osx_image: xcode8
-#     env: SDKROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk MACOSX_DEPLOYMENT_TARGET=10.11
-    # Build on the latest OSX version (will eventually become obsolete)
+      arch: amd64
+    # Latest xcode image (needs periodic updating)
     - os: osx
       compiler: clang
-      osx_image: xcode8.2
+      osx_image: xcode11.2
+      arch: amd64
   exclude:
     - os: osx
       compiler: gcc
-before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -qq update; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -qq -y libaio-dev libnuma-dev libz-dev librbd-dev glusterfs-common libibverbs-dev librdmacm-dev; fi
+
+install:
+  - ci/travis-install.sh
+
 script:
-  - ./configure --extra-cflags="-Werror" && make && make test
+  - ci/travis-build.sh