Skip to content

Commit

Permalink
Use "phase" script for travis build phases.
Browse files Browse the repository at this point in the history
This is the first step towards unifying travis configs for toxcore,
hstox, and qtox.
  • Loading branch information
iphydf committed Sep 11, 2016
1 parent 6683a4b commit 2db31d9
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 7 deletions.
14 changes: 7 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ language: c

matrix:
include:
- env: BUILD=hstox ENV=linux
- env: JOB=hstox ENV=linux
language: haskell
ghc: 7.8
- env: BUILD=toxcore ENV=linux
- env: JOB=toxcore ENV=linux
compiler: clang
- env: BUILD=toxcore ENV=linux
- env: JOB=toxcore ENV=linux
compiler: gcc
- env: BUILD=autotools ENV=linux
- env: JOB=autotools ENV=linux
compiler: clang

addons:
Expand Down Expand Up @@ -38,9 +38,9 @@ cache:
- $HOME/.ghc
- $HOME/cache

install: other/travis/${BUILD}-install
script: other/travis/${BUILD}-script
after_script: other/travis/${BUILD}-after_script
install: other/travis/phase $JOB $ENV install
script: other/travis/phase $JOB $ENV script
after_script: other/travis/phase $JOB $ENV after_script

notifications:
irc: "chat.freenode.net#toktok-status"
Expand Down
22 changes: 22 additions & 0 deletions other/travis/phase
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/bin/sh

set -e -u -x

JOB="$1"
ENV="$2"
PHASE="$3"

. "other/travis/env.sh"
. "other/travis/env-$ENV.sh"

try_source() {
SCRIPT="other/travis/$1"
if [ -f "$SCRIPT" ]; then
. "$SCRIPT"
fi
}

try_source "$PHASE"
try_source "$ENV-$PHASE"
try_source "$JOB-$PHASE"
try_source "$JOB-$ENV-$PHASE"

0 comments on commit 2db31d9

Please sign in to comment.