X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=.travis.yml;h=e35aff394b999f0cf6e54797c3cbb5bee1a0d029;hp=94f69fb59763d5ceb9ac4824f9771e4d6e36cb14;hb=d61215e076fe3b51c0ed92dd985101b84bbcd757;hpb=c032d6743ad21cc6702e8ac71afe227e9cd8773c

diff --git a/.travis.yml b/.travis.yml
index 94f69fb5..e35aff39 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,51 +1,37 @@
 language: c
+dist: bionic
 os:
   - linux
 compiler:
   - clang
   - gcc
+arch:
+  - amd64
+  - arm64
 env:
-  matrix:
-    - BUILD_ARCH="x86"
-    - BUILD_ARCH="x86_64"
   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"]
-      env: BUILD_ARCH="x86_64"
-    # 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.3
-      env: BUILD_ARCH="x86_64"
+      osx_image: xcode11.2
+      arch: amd64
   exclude:
     - os: osx
       compiler: gcc
-  exclude:
-    - os: linux
-      compiler: clang
-      env: BUILD_ARCH="x86" # Only do the gcc x86 build to reduce clutter
-before_install:
-  - EXTRA_CFLAGS="-Werror"
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-        pkgs=(libaio-dev libnuma-dev libz-dev librbd-dev libibverbs-dev librdmacm-dev);
-        if [[ "$BUILD_ARCH" == "x86" ]]; then
-            pkgs=("${pkgs[@]/%/:i386}");
-            pkgs+=(gcc-multilib);
-            EXTRA_CFLAGS="${EXTRA_CFLAGS} -m32";
-        else
-            pkgs+=(glusterfs-common);
-        fi;
-        sudo apt-get -qq update;
-        sudo apt-get install --no-install-recommends -qq -y "${pkgs[@]}";
-    fi
+
+install:
+  - ci/travis-install.sh
+
 script:
-  - ./configure --extra-cflags="${EXTRA_CFLAGS}" && make
-  - make test
+  - ci/travis-build.sh