From 2e988dbf35211e2346d694ad534166c49b297703 Mon Sep 17 00:00:00 2001 From: Alex Arslan Date: Sat, 7 Apr 2018 10:56:34 -0700 Subject: [PATCH 1/2] Add macOS to the Travis testing matrix --- .travis.yml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0b280c2fc..3460db719 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ language: c jobs: include: - &test-ubuntu + os: linux stage: test compiler: gcc addons: @@ -57,7 +58,8 @@ jobs: - TARGET_BOX=LINUX32 - BTYPE="BINARY=32" - - stage: test + - os: linux + stage: test compiler: gcc addons: apt: @@ -77,6 +79,7 @@ jobs: # which is slower than container-based infrastructure used for jobs # that don't require sudo. - &test-alpine + os: linux stage: test dist: trusty sudo: true @@ -120,6 +123,7 @@ jobs: - BTYPE="BINARY=64 NO_AFFINITY=1 USE_OPENMP=0 NO_LAPACK=0 TARGET=core2" - &test-cmake + os: linux stage: test compiler: clang addons: @@ -147,6 +151,18 @@ jobs: env: - CMAKE=1 + - os: osx + stage: test + osx_image: xcode8 + before_script: + - COMMON_FLAGS="DYNAMIC_ARCH=1 TARGET=NEHALEM NUM_THREADS=32" + - brew update + - brew install gcc # for gfortran + script: + - travis_wait 45 make QUIET_MAKE=1 $COMMON_FLAGS $BTYPE + env: + - BTYPE="BINARY=64 INTERFACE64=1" + # whitelist branches: only: From b966bd79d5499d37e15b72bda0aad2ef4167b45f Mon Sep 17 00:00:00 2001 From: Alex Arslan Date: Sat, 7 Apr 2018 12:29:57 -0700 Subject: [PATCH 2/2] Add a BINARY=32 build to macOS --- .travis.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3460db719..4a25e7121 100644 --- a/.travis.yml +++ b/.travis.yml @@ -151,7 +151,8 @@ jobs: env: - CMAKE=1 - - os: osx + - &test-macos + os: osx stage: test osx_image: xcode8 before_script: @@ -163,6 +164,10 @@ jobs: env: - BTYPE="BINARY=64 INTERFACE64=1" + - <<: *test-macos + env: + - BTYPE="BINARY=32" + # whitelist branches: only: