diff --git a/.travis_scripts/cmake_builder.sh b/.travis_scripts/cmake_builder.sh index c011878..ccb3331 100755 --- a/.travis_scripts/cmake_builder.sh +++ b/.travis_scripts/cmake_builder.sh @@ -12,10 +12,10 @@ # Optional environmental variables # - DESTDIR <- used for setting the install prefix # - BUILD_TOOL=["Unix Makefile"|"Ninja"] -# - BUILDNAME <-- how to identify this build on the dashboard +# - BUILDNAME <- how to identify this build on the dashboard # - DO_MemCheck <- if set, try to use valgrind -# - DO_Coverage <- if set, try to do dashboard coverage testing -# +# - DO_Coverage <- if set, try to do dashboard coverage testing +# env_set=1 if ${BUILD_TYPE+false}; then @@ -78,7 +78,7 @@ if ! ${DO_MemCheck+false}; then valgrind --version CTEST_TESTING_OPTION="-D ExperimentalMemCheck" else -# - DO_Coverage <- if set, try to do dashboard coverage testing +# - DO_Coverage <- if set, try to do dashboard coverage testing if ! ${DO_Coverage+false}; then export CXXFLAGS="-fprofile-arcs -ftest-coverage" export LDFLAGS="-fprofile-arcs -ftest-coverage" @@ -117,14 +117,14 @@ cd "${_BUILD_DIR_NAME}" ctest -C ${BUILD_TYPE} -D ExperimentalStart -D ExperimentalConfigure -D ExperimentalBuild ${CTEST_TESTING_OPTION} -D ExperimentalSubmit # Final step is to verify that installation succeeds cmake --build . --config ${BUILD_TYPE} --target install - + if [ "${DESTDIR}" != "/usr/local" ]; then ${_BUILD_EXE} install fi cd - if ${CLEANUP+false}; then - echo "Skipping cleanup: build directory will persist." + echo "Skipping cleanup: build directory will persist." else rm -r "${_BUILD_DIR_NAME}" fi diff --git a/.travis_scripts/travis.before_install.linux.sh b/.travis_scripts/travis.before_install.linux.sh index 18e019d..9b556de 100644 --- a/.travis_scripts/travis.before_install.linux.sh +++ b/.travis_scripts/travis.before_install.linux.sh @@ -1,7 +1,8 @@ set -vex -#before_install: pyenv install 3.5.4 && pyenv global 3.5.4 -#before_install: pyenv global 3.6 -# https://docs.travis-ci.com/user/languages/python/ -# "for Trusty, this means 2.7.6 and 3.4.3" -pyenv global 3.6 +# Preinstalled versions of python are dependent on which Ubuntu distribution +# you are running. The below version needs to be updated whenever we roll +# the Ubuntu version used in Travis. +# https://docs.travis-ci.com/user/languages/python/ + +pyenv global 3.7.1 diff --git a/.travis_scripts/travis.before_install.osx.sh b/.travis_scripts/travis.before_install.osx.sh index d7d11a5..5d83c0c 100644 --- a/.travis_scripts/travis.before_install.osx.sh +++ b/.travis_scripts/travis.before_install.osx.sh @@ -1,5 +1 @@ # NOTHING TO DO HERE -# set -vex - -#brew install pyenv -#which pyenv diff --git a/.travis_scripts/travis.install.linux.sh b/.travis_scripts/travis.install.linux.sh index 84c3a61..7c5846f 100644 --- a/.travis_scripts/travis.install.linux.sh +++ b/.travis_scripts/travis.install.linux.sh @@ -1,6 +1,6 @@ set -vex -wget https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-linux.zip +wget https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-linux.zip unzip -q ninja-linux.zip -d build pip3 install meson diff --git a/.travis_scripts/travis.install.osx.sh b/.travis_scripts/travis.install.osx.sh index 1c6c6f0..5d83c0c 100644 --- a/.travis_scripts/travis.install.osx.sh +++ b/.travis_scripts/travis.install.osx.sh @@ -1,5 +1 @@ # NOTHING TO DO HERE -# set -vex - -#python3 -m venv venv -#source venv/bin/activate