Cleanup travis scripts

2025-04-13 00:03:09 -04:00 · 2015-08-12 23:39:02 +10:00 · 2015-08-12 23:39:02 +10:00 · 6415a75b51
commit 6415a75b51
parent 6da3492692
9 changed files with 4 additions and 7 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -30,17 +30,14 @@ addons:
  postgresql: "9.1"

 before_install:
-  - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then ./ci/travis/before_install-linux.sh; fi"
-  - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'osx' ]; then ./ci/travis/before_install-osx.sh; fi"
+  - ./ci/travis/${TRAVIS_OS_NAME}/before_install.sh

 install:
-  - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then ./ci/travis/install-linux.sh; fi"
-  - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'osx' ]; then ./ci/travis/install-osx.sh; fi"
+  - ./ci/travis/${TRAVIS_OS_NAME}/install.sh

 before_script:
-  - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then ./ci/travis/before_script-linux.sh; fi"
+  - ./ci/travis/${TRAVIS_OS_NAME}/before_script.sh

 script:
-  - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then ./ci/travis/script-linux.sh; fi"
-  - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'osx' ]; then ./ci/travis/script-osx.sh; fi"
+  - ./ci/travis/${TRAVIS_OS_NAME}/script.sh

--- a/ci/travis/linux/before_install.sh
+++ b/ci/travis/linux/before_install.sh
--- a/ci/travis/linux/before_script.sh
+++ b/ci/travis/linux/before_script.sh
--- a/ci/travis/linux/install.sh
+++ b/ci/travis/linux/install.sh
--- a/ci/travis/linux/script.sh
+++ b/ci/travis/linux/script.sh
--- a/ci/travis/osx/before_install.sh
+++ b/ci/travis/osx/before_install.sh
--- a/ci/travis/osx/before_script.sh
+++ b/ci/travis/osx/before_script.sh
--- a/ci/travis/osx/install.sh
+++ b/ci/travis/osx/install.sh
--- a/ci/travis/osx/script.sh
+++ b/ci/travis/osx/script.sh