From 5f829b27675d79ddbf452e6c60cb67dc980a9ff2 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Tue, 8 Jan 2019 21:30:34 -0500 Subject: [PATCH] Rearranging scripts --- .travis.yml | 6 ++++-- travis-ci/build_linux.sh | 1 - travis-ci/build_macos.sh | 1 - travis-ci/prep_linux.sh | 1 + travis-ci/prep_macos.sh | 1 + 5 files changed, 6 insertions(+), 4 deletions(-) delete mode 100644 travis-ci/build_linux.sh delete mode 100644 travis-ci/build_macos.sh create mode 100644 travis-ci/prep_linux.sh create mode 100644 travis-ci/prep_macos.sh diff --git a/.travis.yml b/.travis.yml index b2626b0..d39c06c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,9 +10,11 @@ addons: - libgtk-3-dev - freeglut3 - freeglut3-dev +before_install: + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then bash travis-ci/prep_macos.sh; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then bash travis-ci/prep_linux.sh; fi script: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then bash travis-ci/build_macos.sh; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then bash travis-ci/build_linux.sh; fi + - bash travis-ci/build_common.sh cache: directories: - /home/travis/build/wxWidgets/staticlib diff --git a/travis-ci/build_linux.sh b/travis-ci/build_linux.sh deleted file mode 100644 index c645cb7..0000000 --- a/travis-ci/build_linux.sh +++ /dev/null @@ -1 +0,0 @@ -exec $HOME/build/cjcliffe/CubicSDR/travis-ci/build_common.sh diff --git a/travis-ci/build_macos.sh b/travis-ci/build_macos.sh deleted file mode 100644 index c645cb7..0000000 --- a/travis-ci/build_macos.sh +++ /dev/null @@ -1 +0,0 @@ -exec $HOME/build/cjcliffe/CubicSDR/travis-ci/build_common.sh diff --git a/travis-ci/prep_linux.sh b/travis-ci/prep_linux.sh new file mode 100644 index 0000000..5b0326f --- /dev/null +++ b/travis-ci/prep_linux.sh @@ -0,0 +1 @@ +echo "Linux specific stuff goes here" diff --git a/travis-ci/prep_macos.sh b/travis-ci/prep_macos.sh new file mode 100644 index 0000000..b91f946 --- /dev/null +++ b/travis-ci/prep_macos.sh @@ -0,0 +1 @@ +echo "MacOS-specific stuff goes here"