diff --git a/.travis.yml b/.travis.yml index 8f24643407..92e6c5b6b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,12 +19,12 @@ branches: only: - - master + # - master - dev - # - /^v\d+\.\d+\.\d+$/ - # - /^release-\d+\.\d+\.\d+$/ - # - /^feature-ci-.+$/ - # - /^feature_ci_.+$/ + - /^v\d+\.\d+\.\d+$/ + - /^release-\d+\.\d+\.\d+$/ + - /^feature-ci-.+$/ + - /^feature_ci_.+$/ linux: &linux os: linux @@ -74,7 +74,7 @@ matrix: # env: CONAN_CLANG_VERSIONS=3.9 CONAN_DOCKER_IMAGE=lasote/conanclang39 # macOS, apple-Clang, libc++ ------------------------------------------------- - - <<: *osx + - <<: *osx osx_image: xcode9 env: CONAN_APPLE_CLANG_VERSIONS=9.0 BITPRIM_RUN_TESTS=true @@ -87,12 +87,12 @@ matrix: osx_image: xcode7.3 env: CONAN_APPLE_CLANG_VERSIONS=7.3 -# before_install: -# - | -# if [[ "${TRAVIS_COMMIT_MESSAGE}" = *"[skip travis]"* ]]; then -# echo "[skip travis] detected in commit message, exiting" -# travis_terminate 0 -# fi +before_install: + - | + if [[ "${TRAVIS_COMMIT_MESSAGE}" = *"[skip travis]"* ]]; then + echo "[skip travis] detected in commit message, exiting" + travis_terminate 0 + fi install: - cd ${TRAVIS_BUILD_DIR}