Browse Source
Merge pull request #3164 from martin-frbg/travisosxomp
Fix xcode12 build on Travis and add OSX/OpenMP jobtags/v0.3.15
Martin Kroeker
GitHub
4 years ago
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Unified View
Diff Options
-
+12 -3.travis.yml
+ 12
- 3
.travis.yml
View File
| @@ -224,12 +224,21 @@ matrix: | |||||
| before_script: | before_script: | ||||
| - COMMON_FLAGS="DYNAMIC_ARCH=1 NUM_THREADS=32" | - COMMON_FLAGS="DYNAMIC_ARCH=1 NUM_THREADS=32" | ||||
| - brew update | - brew update | ||||
| - brew install gcc@10 | |||||
| script: | script: | ||||
| - travis_wait 45 make QUIET_MAKE=1 $COMMON_FLAGS $BTYPE | - travis_wait 45 make QUIET_MAKE=1 $COMMON_FLAGS $BTYPE | ||||
| env: | env: | ||||
| - BTYPE="TARGET=NEHALEM BINARY=64 INTERFACE64=1 FC=gfortran-10" | |||||
| - BTYPE="TARGET=HASWELL USE_OPENMP=1 BINARY=64 INTERFACE64=1 FC=gfortran-10" | |||||
| - <<: *test-macos | |||||
| osx_image: xcode12 | |||||
| before_script: | |||||
| - COMMON_FLAGS="DYNAMIC_ARCH=1 NUM_THREADS=32" | |||||
| - brew update | |||||
| script: | |||||
| - travis_wait 45 make QUIET_MAKE=1 $COMMON_FLAGS $BTYPE | |||||
| env: | |||||
| - BTYPE="TARGET=NEHALEM BINARY=64 INTERFACE64=1 FC=gfortran-10" | |||||
| # - <<: *test-macos | # - <<: *test-macos | ||||
| # osx_image: xcode10 | # osx_image: xcode10 | ||||
| # env: | # env: | ||||