From 10a1a38b37c2189bda229f7772ced4c4f919641b Mon Sep 17 00:00:00 2001 From: Hans Johnson Date: Sat, 12 Jan 2019 08:54:50 -0600 Subject: [PATCH] ENH: move travis support scripts to .travis_scripts Move the build support scripts for travis to a hidden subdirectory to keep the top level directory more clean. --- .travis.yml | 17 +++++++---------- .../travis.before_install.linux.sh | 0 .../travis.before_install.osx.sh | 0 .../travis.install.linux.sh | 0 .../travis.install.osx.sh | 0 travis.sh => .travis_scripts/travis.sh | 0 6 files changed, 7 insertions(+), 10 deletions(-) rename travis.before_install.linux.sh => .travis_scripts/travis.before_install.linux.sh (100%) rename travis.before_install.osx.sh => .travis_scripts/travis.before_install.osx.sh (100%) rename travis.install.linux.sh => .travis_scripts/travis.install.linux.sh (100%) rename travis.install.osx.sh => .travis_scripts/travis.install.osx.sh (100%) rename travis.sh => .travis_scripts/travis.sh (100%) diff --git a/.travis.yml b/.travis.yml index 90c17fa..393bd5c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,9 @@ language: cpp sudo: false addons: homebrew: - packages: meson ninja + packages: + - meson + - ninja update: false # do not update homebrew by default apt: sources: @@ -27,12 +29,7 @@ matrix: - os: osx osx_image: xcode9.4 compiler: clang - addons: - homebrew: - packages: meson ninja - #env: PYENV_ROOT=/usr/local/var/pyenv - env: LIB_TYPE=static BUILD_TYPE=release HOMEBREW_LOGS=~/homebrew-logs HOMEBREW_TEMP=~/homebrew-temp - #- LIB_TYPE=shared BUILD_TYPE=debug + env: LIB_TYPE=static BUILD_TYPE=release - os: linux dist: trusty compiler: clang @@ -41,7 +38,7 @@ notifications: email: false before_install: -- source ./travis.before_install.${TRAVIS_OS_NAME}.sh +- source ./.travis_scripts/travis.before_install.${TRAVIS_OS_NAME}.sh install: -- source ./travis.install.${TRAVIS_OS_NAME}.sh -script: ./travis.sh +- source ./.travis_scripts/travis.install.${TRAVIS_OS_NAME}.sh +script: ./.travis_scripts/travis.sh diff --git a/travis.before_install.linux.sh b/.travis_scripts/travis.before_install.linux.sh similarity index 100% rename from travis.before_install.linux.sh rename to .travis_scripts/travis.before_install.linux.sh diff --git a/travis.before_install.osx.sh b/.travis_scripts/travis.before_install.osx.sh similarity index 100% rename from travis.before_install.osx.sh rename to .travis_scripts/travis.before_install.osx.sh diff --git a/travis.install.linux.sh b/.travis_scripts/travis.install.linux.sh similarity index 100% rename from travis.install.linux.sh rename to .travis_scripts/travis.install.linux.sh diff --git a/travis.install.osx.sh b/.travis_scripts/travis.install.osx.sh similarity index 100% rename from travis.install.osx.sh rename to .travis_scripts/travis.install.osx.sh diff --git a/travis.sh b/.travis_scripts/travis.sh similarity index 100% rename from travis.sh rename to .travis_scripts/travis.sh