Skip to content

Commit 774bd52

Browse files
committed
Upgrade to latest Travis images
1 parent dc94432 commit 774bd52

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ notifications:
66
matrix:
77
include:
88
- os: linux
9-
dist: xenial
9+
dist: focal
1010
- os: osx
11-
osx_image: xcode10.2
11+
osx_image: xcode12.2
1212
- os: windows
1313

1414
git:
@@ -17,7 +17,6 @@ git:
1717

1818
before_install:
1919
- export -f travis_nanoseconds travis_time_start travis_time_finish
20-
- if [ "$TRAVIS_OS_NAME" = windows ]; then choco upgrade -y git.install; fi
2120

2221
script:
2322
- if ! [ -x .cppsm/travis-ci ]; then git submodule --quiet update --init --no-recommend-shallow --depth 1 .cppsm; fi

travis-ci

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,19 @@ for CONFIG in Debug Release; do
9494
folded-finish LIBSTD_INSTALL_PID
9595
CMAKE_BUILD_TYPE=$CONFIG CC=clang CXX=clang++ folded "Clang $CONFIG" cppsm test
9696
folded-finish GCC_INSTALL_PID
97-
CMAKE_BUILD_TYPE=$CONFIG CC=gcc-8 CXX=g++-8 folded "GCC $CONFIG" cppsm test
97+
CMAKE_BUILD_TYPE=$CONFIG CC=gcc-9 CXX=g++-9 folded "GCC $CONFIG" cppsm test
9898
elif [ "$TRAVIS_OS_NAME" = windows ]; then
9999
CMAKE_BUILD_TYPE=$CONFIG CC='' CXX='' folded "VC2017 $CONFIG" cppsm test
100100
folded-finish MAKE_INSTALL_PID
101101
CMAKE_BUILD_TYPE=$CONFIG CC="gcc" CXX="g++" folded "GCC $CONFIG" cppsm test
102102
elif [ "$TRAVIS_OS_NAME" = osx ]; then
103103
CMAKE_BUILD_TYPE=$CONFIG CC='' CXX='' CMAKE_GENERATOR=Xcode folded "Clang $CONFIG" cppsm test
104-
CMAKE_BUILD_TYPE=$CONFIG CC=gcc-8 CXX=g++-8 folded "GCC $CONFIG" cppsm test
104+
for ((i=8; i<20; ++i)); do
105+
if command -v "gcc-$i" > /dev/null ; then
106+
CMAKE_BUILD_TYPE=$CONFIG CC=gcc-$i CXX=g++-$i folded "GCC $CONFIG" cppsm test
107+
break
108+
fi
109+
done
105110
else
106111
echo "Unsupported OS: $TRAVIS_OS_NAME"
107112
exit 1
@@ -110,7 +115,6 @@ done
110115

111116
if [ "$TRAVIS_OS_NAME" = windows ]; then
112117
folded-finish VC2019_INSTALL_PID
113-
folded ... choco upgrade -y cmake.install
114118

115119
for CONFIG in Debug Release; do
116120
CMAKE_BUILD_TYPE=$CONFIG CC='' CXX='' CMAKE_GENERATOR="Visual Studio 16 2019" folded "VC2019 $CONFIG" cppsm test

0 commit comments

Comments
 (0)