Skip to content

Commit f1726ce

Browse files
redboltzredboltz
committed
Updated travis-ci environment.
1 parent 8a788f3 commit f1726ce

File tree

3 files changed

+38
-40
lines changed

3 files changed

+38
-40
lines changed

‎.travis.yml‎

Lines changed: 32 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ install:
1010
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then ./cmake-3.7.1-Linux-x86_64.sh --prefix=${BASE}/usr --skip-license; fi
1111
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then export PATH="${BASE}/usr/bin:$PATH"; fi
1212
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then export LD_LIBRARY_PATH="${BASE}/usr/lib:$LD_LIBRARY_PATH"; fi
13-
- if [ "$CXX" == "g++" ]; then export CXX="g++-6" CC="gcc-6"; fi
14-
- if [ "$CXX" == "clang++" ] && [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$MSGPACK_FUZZ_REGRESSION" != "ON" ]; then export CXX="clang++-3.9" CC="clang-3.9"; fi
15-
- if [ "$CXX" == "clang++" ] && [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$MSGPACK_FUZZ_REGRESSION" == "ON" ]; then export CXX="clang++-5.0" CC="clang-5.0"; fi
13+
- if [ "$CXX" == "g++" ]; then export CXX="g++-7" CC="gcc-7"; fi
14+
- if [ "$CXX" == "clang++" ] && [ "$TRAVIS_OS_NAME" == "linux" ]; then export CXX="clang++-5.0" CC="clang-5.0"; fi
1615
- if [ "$CXX" == "g++" ] && [ "$TRAVIS_OS_NAME" == "linux" ]; then cd /usr/include/c++/$(g++ -v 2>&1 | grep version | awk '{print $3}')/bits; ln -s ../ext/atomicity.h .; cd ${BASE}/usr; fi
1716
#gtest
1817
- wget https://github.com/google/googletest/archive/release-1.7.0.zip -O googletest-release-1.7.0.zip
@@ -30,8 +29,8 @@ install:
3029
# valgrind
3130
- if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$MSGPACK_FUZZ_REGRESSION" != "ON" ]; then wget http://valgrind.org/downloads/valgrind-3.12.0.tar.bz2 && tar xjf valgrind-3.12.0.tar.bz2 && cd valgrind-3.12.0 && ./configure --prefix=${BASE}/usr > /dev/null && make -j3 > /dev/null && make install > /dev/null && cd ..; fi
3231
# boost
33-
- if [ "$BOOST" == "ON" ] && [ "MSGPACK_FUZZ_REGRESSION" != "ON" ]; then wget http://sourceforge.net/projects/boost/files/boost/1.66.0/boost_1_66_0.zip && unzip -q boost_1_66_0.zip && cd boost_1_66_0 && ./bootstrap.sh && ./b2 -j3 --prefix=${BASE}/usr --with-chrono --with-context --with-system --with-timer address-model=${ARCH} install > /dev/null && cd ..; fi
34-
- if [ "$MSGPACK_FUZZ_REGRESSION" == "ON" ]; then wget http://sourceforge.net/projects/boost/files/boost/1.66.0/boost_1_66_0.zip && unzip -q boost_1_66_0.zip && cd boost_1_66_0 && ./bootstrap.sh --with-toolset=clang && ./b2 clean && ./b2 -j$(nproc) --prefix=${BASE}/usr --with-system --with-filesystem address-model=${ARCH} install > /dev/null && cd ..; fi
32+
- if [ "$BOOST" == "ON" ] && [ "MSGPACK_FUZZ_REGRESSION" != "ON" ]; then wget http://sourceforge.net/projects/boost/files/boost/1.67.0/boost_1_67_0.zip && unzip -q boost_1_67_0.zip && cd boost_1_67_0 && ./bootstrap.sh && ./b2 -j3 --prefix=${BASE}/usr --with-chrono --with-context --with-system --with-timer address-model=${ARCH} install > /dev/null && cd ..; fi
33+
- if [ "$MSGPACK_FUZZ_REGRESSION" == "ON" ]; then wget http://sourceforge.net/projects/boost/files/boost/1.67.0/boost_1_67_0.zip && unzip -q boost_1_67_0.zip && cd boost_1_67_0 && ./bootstrap.sh --with-toolset=clang && ./b2 clean && ./b2 -j$(nproc) --prefix=${BASE}/usr --with-system --with-filesystem address-model=${ARCH} install > /dev/null && cd ..; fi
3534
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo ln -s /usr/include/x86_64-linux-gnu/zconf.h /usr/include; fi
3635

3736
matrix:
@@ -55,15 +54,14 @@ matrix:
5554
apt:
5655
sources:
5756
- ubuntu-toolchain-r-test
58-
- llvm-toolchain-precise-3.9
59-
- llvm-toolchain-precise
57+
- llvm-toolchain-trusty-5.0
6058
packages:
6159
- g++-multilib
6260
- gcc-multilib
63-
- gcc-5-multilib
64-
- g++-5-multilib
61+
- gcc-7-multilib
62+
- g++-7-multilib
6563
- bzip2
66-
- clang-3.9
64+
- clang-5.0
6765
- libc6-dbg
6866
- os: linux
6967
compiler: clang
@@ -72,20 +70,19 @@ matrix:
7270
apt:
7371
sources:
7472
- ubuntu-toolchain-r-test
75-
- llvm-toolchain-precise-3.9
76-
- llvm-toolchain-precise
73+
- llvm-toolchain-trusty-5.0
7774
packages:
7875
- g++-multilib
7976
- gcc-multilib
80-
- gcc-5-multilib
81-
- g++-5-multilib
77+
- gcc-7-multilib
78+
- g++-7-multilib
8279
- lib32stdc++6-6-dbg
8380
- lib32gcc1
8481
- libc6-i386
8582
- lib32z1-dev
8683
- zlib1g-dev
8784
- bzip2
88-
- clang-3.9
85+
- clang-5.0
8986
- libc6-dbg
9087
- os: linux
9188
compiler: clang
@@ -94,15 +91,14 @@ matrix:
9491
apt:
9592
sources:
9693
- ubuntu-toolchain-r-test
97-
- llvm-toolchain-precise-3.9
98-
- llvm-toolchain-precise
94+
- llvm-toolchain-trusty-5.0
9995
packages:
10096
- g++-multilib
10197
- gcc-multilib
102-
- gcc-5-multilib
103-
- g++-5-multilib
98+
- gcc-7-multilib
99+
- g++-7-multilib
104100
- bzip2
105-
- clang-3.9
101+
- clang-5.0
106102
- libc6-dbg
107103
- os: linux
108104
compiler: clang
@@ -111,20 +107,19 @@ matrix:
111107
apt:
112108
sources:
113109
- ubuntu-toolchain-r-test
114-
- llvm-toolchain-precise-3.9
115-
- llvm-toolchain-precise
110+
- llvm-toolchain-trusty-5.0
116111
packages:
117112
- g++-multilib
118113
- gcc-multilib
119-
- gcc-5-multilib
120-
- g++-5-multilib
114+
- gcc-7-multilib
115+
- g++-7-multilib
121116
- lib32stdc++6-6-dbg
122117
- lib32gcc1
123118
- libc6-i386
124119
- lib32z1-dev
125120
- zlib1g-dev
126121
- bzip2
127-
- clang-3.9
122+
- clang-5.0
128123
- libc6-dbg
129124
- os: linux
130125
compiler: gcc
@@ -136,8 +131,8 @@ matrix:
136131
packages:
137132
- g++-multilib
138133
- gcc-multilib
139-
- gcc-6-multilib
140-
- g++-6-multilib
134+
- gcc-7-multilib
135+
- g++-7-multilib
141136
- bzip2
142137
- libc6-dbg
143138
- os: linux
@@ -150,8 +145,8 @@ matrix:
150145
packages:
151146
- g++-multilib
152147
- gcc-multilib
153-
- gcc-6-multilib
154-
- g++-6-multilib
148+
- gcc-7-multilib
149+
- g++-7-multilib
155150
- lib32stdc++6-6-dbg
156151
- lib32gcc1
157152
- libc6-i386
@@ -169,8 +164,8 @@ matrix:
169164
packages:
170165
- g++-multilib
171166
- gcc-multilib
172-
- gcc-6-multilib
173-
- g++-6-multilib
167+
- gcc-7-multilib
168+
- g++-7-multilib
174169
- bzip2
175170
- libc6-dbg
176171
- os: linux
@@ -183,8 +178,8 @@ matrix:
183178
packages:
184179
- g++-multilib
185180
- gcc-multilib
186-
- gcc-6-multilib
187-
- g++-6-multilib
181+
- gcc-7-multilib
182+
- g++-7-multilib
188183
- lib32stdc++6-6-dbg
189184
- lib32gcc1
190185
- libc6-i386
@@ -202,8 +197,8 @@ matrix:
202197
packages:
203198
- g++-multilib
204199
- gcc-multilib
205-
- gcc-6-multilib
206-
- g++-6-multilib
200+
- gcc-7-multilib
201+
- g++-7-multilib
207202
- lib32stdc++6-6-dbg
208203
- lib32gcc1
209204
- libc6-i386
@@ -218,8 +213,7 @@ matrix:
218213
apt:
219214
sources:
220215
- ubuntu-toolchain-r-test
221-
- llvm-toolchain-precise-3.9
222-
- llvm-toolchain-precise
216+
- llvm-toolchain-trusty-5.0
223217
packages:
224218
- bzip2
225219
- clang-5.0
@@ -232,8 +226,7 @@ matrix:
232226
apt:
233227
sources:
234228
- ubuntu-toolchain-r-test
235-
- llvm-toolchain-precise-3.9
236-
- llvm-toolchain-precise
229+
- llvm-toolchain-trusty-5.0
237230
packages:
238231
- bzip2
239232
- clang-5.0

‎ci/build_regression.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ then
2222
exit 1
2323
fi
2424

25-
cmake -DMSGPACK_FUZZ_REGRESSION="ON" -DMSGPACK_CXX17="ON" -DMSGPACK_BOOST=${BOOST} -DMSGPACK_SAN=${MSGPACK_SAN} -v ..
25+
cmake -DMSGPACK_FUZZ_REGRESSION="ON" -DMSGPACK_CXX11="ON" -DMSGPACK_BOOST=${BOOST} -DMSGPACK_SAN=${MSGPACK_SAN} -v ..
2626

2727
ret=$?
2828
if [ $ret -ne 0 ]

‎test/msgpack_cpp17.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
#include "config.h"
77
#endif
88

9+
// To avoid link error
10+
TEST(MSGPACK_CPP17, dummy)
11+
{
12+
}
13+
914
#if !defined(MSGPACK_USE_CPP03) && __cplusplus >= 201703
1015

1116
// C++17

0 commit comments

Comments
 (0)