Browse Source

Update travis config. Should no longer fail now

Godzil 3 years ago
parent
commit
8e62b1c934
1 changed files with 61 additions and 32 deletions
  1. 61 32
      .travis.yml

+ 61 - 32
.travis.yml

@@ -1,11 +1,4 @@
-dist: trusty
 language: c
-os:
-  - linux
-  - osx
-#matrix:
-#  allow_failures:
-#    - os: osx
 
 addons:
   apt:
@@ -14,40 +7,76 @@ addons:
       - curl
       - xorg-dev
       - libglu1-mesa-dev
-#  sonarcloud:
-#    organisation: "godzil-github"
-#    token: ${SONARCLOUD_TOKEN}
-
-compiler:
-  - clang
-  - gcc
 
 script:
   - mkdir build
   - cd build
   - cmake -DUSE_ALLEGRO=OFF -DUSE_PROFILING=OFF -DCOVERALLS=OFF -DCMAKE_BUILD_TYPE=Release ..
   - cmake --build .
-  - cd ..
-#  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mkdir sonar; cd sonar; cmake -DUSE_ALLEGRO=OFF -DUSE_PROFILING=OFF -DCOVERALLS=OFF -DCMAKE_BUILD_TYPE=Release ..; fi
-#  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then make clean ; fi
-#  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then build-wrapper-linux-x86-64 --out-dir bw-output cmake --build . ; fi
-#  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd .. ; fi
-#  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sonar-scanner -Dsonar.login=$SONARCLOUD_TOKEN; fi
-  - mkdir coverage
-  - cd coverage
-  - cmake -DUSE_ALLEGRO=OFF -DUSE_PROFILING=OFF -DCOVERALLS=ON -DCMAKE_BUILD_TYPE=Debug ..
-  - cmake --build .
-  - cmake --build . --target coveralls
-
-cache:
-  directories:
-    - '$HOME/.sonar/cache'
 
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update      ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install glew; fi
 
-install: true
+jobs:
+  include:
+    - os: linux
+      dist: bionic
+      arch: amd64
+      compiler: gcc
+
+    - os: linux
+      dist: bionic
+      arch: amd64
+      compiler: clang
+
+    - os: linux
+      dist: focal
+      arch: amd64
+      compiler: gcc
+
+    - os: linux
+      dist: focal
+      arch: amd64
+      compiler: clang
+
+    - os: osx
+      compiler: clang
+      osx_image: xcode12.2
+
+    - os: linux
+      dist: focal
+      arch: arm64
+      compiler: gcc
+
+    - os: osx
+      compiler: clang
+      osx_image: xcode10.3
+
+    - os: osx
+      compiler: clang
+      osx_image: xcode11.6
+
+    - os: osx
+      compiler: clang
+      osx_image: xcode12
+      
+    - stage: "Coverage"
+      os: linux
+      dist: bionic
+      arch: amd64
+      compiler: gcc
+      script:
+        - mkdir coverage
+        - cd coverage
+        - cmake -DUSE_ALLEGRO=OFF -DUSE_PROFILING=OFF -DCOVERALLS=ON -DCMAKE_BUILD_TYPE=Debug ..
+        - cmake --build .
+        - cmake --build . --target coveralls
+      after_success:
+        - bash <(curl -s https://codecov.io/bash)
+
+  allow_failures:
+    - os: linux
+      arch: arm64
 
-after_success:
-  - bash <(curl -s https://codecov.io/bash)
+    - os: osx