Skip to content

Commit

Permalink
* Updating travis.yml to use the PR, branch, etc. rather than always …
Browse files Browse the repository at this point in the history
…building master
  • Loading branch information
jredmondson committed Jun 15, 2018
1 parent de35fb4 commit 56da40b
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ compiler:
env:
matrix:
global:
- MADARA_ROOT=$TRAVIS_BUILD_DIR/madara
- MADARA_ROOT=$TRAVIS_BUILD_DIR
- GAMS_ROOT=$TRAVIS_BUILD_DIR/gams
- MPC_ROOT=$TRAVIS_BUILD_DIR/MPC
- LD_LIBRARY_PATH=$MADARA_ROOT/lib:$GAMS_ROOT/lib:$LD_LIBRARY_PATH
Expand Down Expand Up @@ -137,8 +137,14 @@ before_script:
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then export OS=linux; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export OS=mac; export CLANG_SUFFIX=; export JAVA_HOME=$(/usr/libexec/java_home) ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:$MADARA_ROOT/lib:$GAMS_ROOT/lib:$VREP_ROOT ; fi
- if [[ "$JAVA" == "java" ]]; then echo "TRAVIS_JDK_VERSION=TRAVIS_JDK_VERSION" ; fi

script:
- echo "TRAVIS_BRANCH=$TRAVIS_BRANCH"
- echo "TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST"
- echo "TRAVIS_BUILD_DIR=$TRAVIS_BUILD_DIR"
- echo ls $TRAVIS_BUILD_DIR
- ls $TRAVIS_BUILD_DIR
- echo $GAMS_ROOT/scripts/$OS/base_build.sh prereqs $CLANG madara tests $SSL $JAVA $ZMQ $SIMTIME
- $GAMS_ROOT/scripts/$OS/base_build.sh prereqs $CLANG madara tests $SSL $JAVA $ZMQ $SIMTIME
# now run a couple of tests
Expand Down

0 comments on commit 56da40b

Please sign in to comment.