Skip to content

Commit 206239a

Browse files
committed
use before_script in travis
1 parent db90fde commit 206239a

File tree

2 files changed

+8
-27
lines changed

2 files changed

+8
-27
lines changed

.travis.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,15 @@ matrix:
106106
# packages:
107107
# - clang-5.0
108108

109+
before_script:
110+
- mkdir -p /tmp/cmake.root
111+
- [[ $TRAVIS_OS_SUFFIX = 'linux' ]]; then CMAKE_PKG_SUFFIX="linux-x86_64"; else CMAKE_PKG_SUFFIX="macos10.10-universal"; fi
112+
- wget -qO- "https://cmake.org/files/v3.20/cmake-3.20.5-$CMAKE_PKG_SUFFIX.tar.gz" | tar --strip-components=1 -xz -C /tmp/cmake.root
113+
- [[ $TRAVIS_OS_SUFFIX = 'linux' ]]; then CMAKE_BIN_DIR="CMake.app/Contents/bin"; else CMAKE_BIN_DIR="bin"; fi
114+
- export PATH=/tmp/cmake.root/$CMAKE_BIN_DIR:$PATH
115+
109116
# Build and check this project
110117
script:
111118
- eval "${MATRIX_EVAL}"
119+
- cmake --version
112120
- ./ci_build.sh

ci_build.sh

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,6 @@ CPPZMQ=${PWD}/cppzmq-build
1212
# Travis machines have 2 cores
1313
JOBS=2
1414

15-
cmake_install() {
16-
local CMAKE_INSTALL_DIR=/tmp/cmake.root
17-
local CMAKE_SUFFIX="none"
18-
19-
if [ $TRAVIS_OS_NAME = "linux" ]; then
20-
CMAKE_SUFFIX="linux-x86_64"
21-
elif [ $TRAVIS_OS_NAME = "osx" ]; then
22-
CMAKE_SUFFIX="macos10.10-universal"
23-
else
24-
echo "TRAVIS_OS_NAME $TRAVIS_OS_NAME not expected"
25-
exit 1
26-
fi
27-
28-
mkdir -p $CMAKE_INSTALL_DIR
29-
wget -qO- "https://cmake.org/files/v3.20/cmake-3.20.5-$CMAKE_SUFFIX.tar.gz" \
30-
| tar --strip-components=1 -xz -C $CMAKE_INSTALL_DIR
31-
32-
if [ $TRAVIS_OS_NAME = "linux" ]; then
33-
export PATH=$CMAKE_INSTALL_DIR/bin:$PATH
34-
elif [ $TRAVIS_OS_NAME = "osx" ]; then
35-
export PATH=$CMAKE_INSTALL_DIR/CMake.app/Contents/bin:$PATH
36-
fi
37-
cmake --version
38-
}
39-
4015
libzmq_install() {
4116
curl -L https://github.com/zeromq/libzmq/archive/v"${ZMQ_VERSION}".tar.gz \
4217
>zeromq.tar.gz
@@ -87,8 +62,6 @@ cppzmq_demo() {
8762
popd
8863
}
8964

90-
cmake_install
91-
9265
if [ "${ZMQ_VERSION}" != "" ] ; then libzmq_install ; fi
9366

9467
cppzmq_build

0 commit comments

Comments
 (0)