Skip to content

Commit 6e627f6

Browse files
committed
Add CLANG, GCC, VS2017, and VS2019 flags
1 parent bf656d5 commit 6e627f6

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

.cppsm/travis-ci

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ done
4242

4343
mkdir travis_ci_test && cd "$_"
4444

45-
NAME=hello cppsm init-hello
45+
NAME=hello VERSION=v1 cppsm init-hello
4646
git commit -m Initial
4747

4848
../travis-ci

travis-ci

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ if [ "$TRAVIS_OS_NAME" = osx ]; then
8282
[ "$CODECOV" != 1 ] || HOMEBREW_NO_INSTALL_CLEANUP=1 folded ... concurrently LCOV_INSTALL_PID locked brew install lcov
8383
[ "$FORMAT_CHECK" = 0 ] || HOMEBREW_NO_INSTALL_CLEANUP=1 folded ... concurrently FORMAT_INSTALL_PID locked brew install prettier clang-format
8484
elif [ "$TRAVIS_OS_NAME" = windows ]; then
85-
folded ... concurrently MAKE_INSTALL_PID choco install make
86-
folded ... concurrently VC2019_INSTALL_PID ignore choco install visualstudio2019-workload-vctools
85+
[ "$GCC" = 0 ] || folded ... concurrently MAKE_INSTALL_PID choco install make
86+
[ "$VS2019" = 0 ] || folded ... concurrently VC2019_INSTALL_PID ignore choco install visualstudio2019-workload-vctools
8787
fi
8888

8989
export CMAKE_HELP
@@ -95,7 +95,7 @@ fi
9595

9696
folded-finish GIT_UPDATE_PID
9797

98-
if [ "$TRAVIS_OS_NAME" = osx ]; then
98+
if [ "$TRAVIS_OS_NAME" = osx ] && [ "$GCC" != 0 ]; then
9999
for ((i=8; i<20; ++i)); do
100100
if command -v "gcc-$i" > /dev/null ; then
101101
GCC_VERSION="$i"
@@ -106,22 +106,22 @@ fi
106106
run-tests() {
107107
for CONFIG in Debug Release; do
108108
if [ "$TRAVIS_OS_NAME" = linux ]; then
109-
CMAKE_BUILD_TYPE=$CONFIG CC=clang CXX=clang++ folded "Clang $CONFIG" cppsm test
110-
CMAKE_BUILD_TYPE=$CONFIG CC=gcc-9 CXX=g++-9 folded "GCC $CONFIG" cppsm test
109+
[ "$CLANG" = 0 ] || CMAKE_BUILD_TYPE=$CONFIG CC=clang CXX=clang++ folded "Clang $CONFIG" cppsm test
110+
[ "$GCC" = 0 ] || CMAKE_BUILD_TYPE=$CONFIG CC=gcc-9 CXX=g++-9 folded "GCC $CONFIG" cppsm test
111111
elif [ "$TRAVIS_OS_NAME" = windows ]; then
112-
CMAKE_BUILD_TYPE=$CONFIG CC='' CXX='' CMAKE_GENERATOR="Visual Studio 15 2017" folded "VC2017 $CONFIG" cppsm test
113-
folded-finish MAKE_INSTALL_PID
114-
CMAKE_BUILD_TYPE=$CONFIG CC="gcc" CXX="g++" folded "GCC $CONFIG" cppsm test
112+
[ "$VS2017" = 0 ] || CMAKE_BUILD_TYPE=$CONFIG CC='' CXX='' CMAKE_GENERATOR="Visual Studio 15 2017" folded "VC2017 $CONFIG" cppsm test
113+
[ "$GCC" = 0 ] || folded-finish MAKE_INSTALL_PID
114+
[ "$GCC" = 0 ] || CMAKE_BUILD_TYPE=$CONFIG CC="gcc" CXX="g++" folded "GCC $CONFIG" cppsm test
115115
elif [ "$TRAVIS_OS_NAME" = osx ]; then
116-
CMAKE_BUILD_TYPE=$CONFIG CC='' CXX='' CMAKE_GENERATOR=Xcode folded "Clang $CONFIG" cppsm test
117-
[ -z "$GCC_VERSION" ] || CMAKE_BUILD_TYPE=$CONFIG CC=gcc-$GCC_VERSION CXX=g++-$GCC_VERSION folded "GCC $CONFIG" cppsm test
116+
[ "$CLANG" = 0 ] || CMAKE_BUILD_TYPE=$CONFIG CC='' CXX='' CMAKE_GENERATOR=Xcode folded "Clang $CONFIG" cppsm test
117+
[ "$GCC" = 0 ] || CMAKE_BUILD_TYPE=$CONFIG CC=gcc-$GCC_VERSION CXX=g++-$GCC_VERSION folded "GCC $CONFIG" cppsm test
118118
else
119119
echo "Unsupported OS: $TRAVIS_OS_NAME"
120120
exit 1
121121
fi
122122
done
123123

124-
if [ "$TRAVIS_OS_NAME" = windows ]; then
124+
if [ "$TRAVIS_OS_NAME" = windows ] && [ "$VS2019" != 0 ]; then
125125
folded-finish VC2019_INSTALL_PID
126126

127127
for CONFIG in Debug Release; do

0 commit comments

Comments
 (0)