Skip to content

Commit c84f2e1

Browse files
committed
Update travis scripts
1 parent 408b466 commit c84f2e1

5 files changed

+12
-19
lines changed

.travis_scripts/cmake_builder.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
# Optional environmental variables
1313
# - DESTDIR <- used for setting the install prefix
1414
# - BUILD_TOOL=["Unix Makefile"|"Ninja"]
15-
# - BUILDNAME <-- how to identify this build on the dashboard
15+
# - BUILDNAME <- how to identify this build on the dashboard
1616
# - DO_MemCheck <- if set, try to use valgrind
17-
# - DO_Coverage <- if set, try to do dashboard coverage testing
18-
#
17+
# - DO_Coverage <- if set, try to do dashboard coverage testing
18+
#
1919

2020
env_set=1
2121
if ${BUILD_TYPE+false}; then
@@ -78,7 +78,7 @@ if ! ${DO_MemCheck+false}; then
7878
valgrind --version
7979
CTEST_TESTING_OPTION="-D ExperimentalMemCheck"
8080
else
81-
# - DO_Coverage <- if set, try to do dashboard coverage testing
81+
# - DO_Coverage <- if set, try to do dashboard coverage testing
8282
if ! ${DO_Coverage+false}; then
8383
export CXXFLAGS="-fprofile-arcs -ftest-coverage"
8484
export LDFLAGS="-fprofile-arcs -ftest-coverage"
@@ -117,14 +117,14 @@ cd "${_BUILD_DIR_NAME}"
117117
ctest -C ${BUILD_TYPE} -D ExperimentalStart -D ExperimentalConfigure -D ExperimentalBuild ${CTEST_TESTING_OPTION} -D ExperimentalSubmit
118118
# Final step is to verify that installation succeeds
119119
cmake --build . --config ${BUILD_TYPE} --target install
120-
120+
121121
if [ "${DESTDIR}" != "/usr/local" ]; then
122122
${_BUILD_EXE} install
123123
fi
124124
cd -
125125

126126
if ${CLEANUP+false}; then
127-
echo "Skipping cleanup: build directory will persist."
127+
echo "Skipping cleanup: build directory will persist."
128128
else
129129
rm -r "${_BUILD_DIR_NAME}"
130130
fi
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
set -vex
2-
#before_install: pyenv install 3.5.4 && pyenv global 3.5.4
3-
#before_install: pyenv global 3.6
2+
3+
# Preinstalled versions of python are dependent on which Ubuntu distribution
4+
# you are running. The below version needs to be updated whenever we roll
5+
# the Ubuntu version used in Travis.
46
# https://docs.travis-ci.com/user/languages/python/
5-
# "for Trusty, this means 2.7.6 and 3.4.3"
67

7-
pyenv global 3.6
8+
pyenv global 3.7.1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
11
# NOTHING TO DO HERE
2-
# set -vex
3-
4-
#brew install pyenv
5-
#which pyenv

.travis_scripts/travis.install.linux.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
set -vex
22

3-
wget https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-linux.zip
3+
wget https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-linux.zip
44
unzip -q ninja-linux.zip -d build
55

66
pip3 install meson

.travis_scripts/travis.install.osx.sh

-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
11
# NOTHING TO DO HERE
2-
# set -vex
3-
4-
#python3 -m venv venv
5-
#source venv/bin/activate

0 commit comments

Comments
 (0)