X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=.travis.yml;h=b64f0a958bbc418212e351e8bec4531c8e4ea18b;hb=653241de1eb5b9abe21cb6feb036df202d388c68;hp=9bef750f8a61535b30d1064e221d633fe9ae42e8;hpb=3bf80dad77448afcb18148e72dc6cfe04bcf7e57;p=fio.git

diff --git a/.travis.yml b/.travis.yml
index 9bef750f..b64f0a95 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,45 @@
 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:
+    # Default xcode image
+    - os: osx
+      compiler: clang # Workaround travis setting CC=["clang", "gcc"]
+      env: BUILD_ARCH="x86_64"
+      arch: amd64
+    # Latest xcode image (needs periodic updating)
+    - os: osx
+      compiler: clang
+      osx_image: xcode11.2
+      env: BUILD_ARCH="x86_64"
+      arch: amd64
+  exclude:
+    - os: osx
+      compiler: gcc
+    - os: linux
+      compiler: clang
+      arch: amd64
+      env: BUILD_ARCH="x86" # Only do the gcc x86 build to reduce clutter
+    - os: linux
+      env: BUILD_ARCH="x86"
+      arch: arm64
+
 before_install:
-  - sudo apt-get -qq update
-  - sudo apt-get install -y libaio-dev libnuma-dev
+  - ci/travis-install.sh
+
+script:
+  - ci/travis-build.sh