mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2024-12-24 17:10:36 +00:00
Use OSX 10.15 and Ubuntu Bionic for all TravisCI runs.
Ideally we'd just say "use the default OS version" and have it auto-upgrade as Travis upgrades their stuff, with no work on our part. Unfortunately, Travis has let their default OSX image lag so far back (it's now 10.13) that Homebrew has started refusing to install GLEW without the `--build-from-source` flag. So, sign up for some extra maintenance work.
This commit is contained in:
parent
3a29576d9f
commit
60fa736904
@ -1,4 +1,5 @@
|
|||||||
language: cpp
|
language: cpp
|
||||||
|
dist: bionic
|
||||||
services:
|
services:
|
||||||
- docker
|
- docker
|
||||||
matrix:
|
matrix:
|
||||||
@ -12,6 +13,7 @@ matrix:
|
|||||||
HYPERROGUE_USE_GLEW=1
|
HYPERROGUE_USE_GLEW=1
|
||||||
HYPERROGUE_USE_PNG=1
|
HYPERROGUE_USE_PNG=1
|
||||||
- os: osx # OSX, autotools
|
- os: osx # OSX, autotools
|
||||||
|
osx_image: xcode12.2
|
||||||
compiler: clang
|
compiler: clang
|
||||||
env: >-
|
env: >-
|
||||||
TRAVIS_OS_NAME=osx
|
TRAVIS_OS_NAME=osx
|
||||||
@ -36,7 +38,6 @@ matrix:
|
|||||||
HYPERROGUE_USE_GLEW=1
|
HYPERROGUE_USE_GLEW=1
|
||||||
HYPERROGUE_USE_PNG=0
|
HYPERROGUE_USE_PNG=0
|
||||||
- os: linux # Linux GCC, make, Rogueviz
|
- os: linux # Linux GCC, make, Rogueviz
|
||||||
dist: bionic
|
|
||||||
compiler: gcc
|
compiler: gcc
|
||||||
env: >-
|
env: >-
|
||||||
TRAVIS_OS_NAME=linux
|
TRAVIS_OS_NAME=linux
|
||||||
@ -63,6 +64,7 @@ matrix:
|
|||||||
HYPERROGUE_USE_PNG=1
|
HYPERROGUE_USE_PNG=1
|
||||||
HYPERROGUE_USE_ROGUEVIZ=1
|
HYPERROGUE_USE_ROGUEVIZ=1
|
||||||
- os: osx # OSX, make
|
- os: osx # OSX, make
|
||||||
|
osx_image: xcode12u
|
||||||
compiler: clang
|
compiler: clang
|
||||||
env: >-
|
env: >-
|
||||||
TRAVIS_OS_NAME=osx
|
TRAVIS_OS_NAME=osx
|
||||||
@ -71,6 +73,7 @@ matrix:
|
|||||||
HYPERROGUE_USE_GLEW=1
|
HYPERROGUE_USE_GLEW=1
|
||||||
HYPERROGUE_USE_PNG=1
|
HYPERROGUE_USE_PNG=1
|
||||||
- os: osx # OSX, make, no libpng
|
- os: osx # OSX, make, no libpng
|
||||||
|
osx_image: xcode11.6
|
||||||
compiler: clang
|
compiler: clang
|
||||||
env: >-
|
env: >-
|
||||||
TRAVIS_OS_NAME=osx
|
TRAVIS_OS_NAME=osx
|
||||||
@ -79,6 +82,7 @@ matrix:
|
|||||||
HYPERROGUE_USE_GLEW=1
|
HYPERROGUE_USE_GLEW=1
|
||||||
HYPERROGUE_USE_PNG=0
|
HYPERROGUE_USE_PNG=0
|
||||||
- os: osx # OSX, make, Rogueviz
|
- os: osx # OSX, make, Rogueviz
|
||||||
|
osx_image: xcode11.5
|
||||||
compiler: clang
|
compiler: clang
|
||||||
env: >-
|
env: >-
|
||||||
TRAVIS_OS_NAME=osx
|
TRAVIS_OS_NAME=osx
|
||||||
@ -96,7 +100,6 @@ matrix:
|
|||||||
HYPERROGUE_USE_GLEW=1
|
HYPERROGUE_USE_GLEW=1
|
||||||
HYPERROGUE_USE_PNG=1
|
HYPERROGUE_USE_PNG=1
|
||||||
- os: linux # Linux GCC, mymake, Rogueviz
|
- os: linux # Linux GCC, mymake, Rogueviz
|
||||||
dist: bionic
|
|
||||||
compiler: gcc
|
compiler: gcc
|
||||||
env: >-
|
env: >-
|
||||||
TRAVIS_OS_NAME=linux
|
TRAVIS_OS_NAME=linux
|
||||||
@ -106,6 +109,7 @@ matrix:
|
|||||||
HYPERROGUE_USE_PNG=1
|
HYPERROGUE_USE_PNG=1
|
||||||
HYPERROGUE_USE_ROGUEVIZ=1
|
HYPERROGUE_USE_ROGUEVIZ=1
|
||||||
- os: osx # OSX, mymake
|
- os: osx # OSX, mymake
|
||||||
|
osx_image: xcode11.4
|
||||||
compiler: clang
|
compiler: clang
|
||||||
env: >-
|
env: >-
|
||||||
TRAVIS_OS_NAME=osx
|
TRAVIS_OS_NAME=osx
|
||||||
@ -114,6 +118,7 @@ matrix:
|
|||||||
HYPERROGUE_USE_GLEW=1
|
HYPERROGUE_USE_GLEW=1
|
||||||
HYPERROGUE_USE_PNG=1
|
HYPERROGUE_USE_PNG=1
|
||||||
- os: osx # OSX, mymake, Rogueviz
|
- os: osx # OSX, mymake, Rogueviz
|
||||||
|
osx_image: xcode11.3
|
||||||
compiler: clang
|
compiler: clang
|
||||||
env: >-
|
env: >-
|
||||||
TRAVIS_OS_NAME=osx
|
TRAVIS_OS_NAME=osx
|
||||||
|
Loading…
Reference in New Issue
Block a user