JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Updating Travis CI to use new build scripts

Browse Source
This commit is contained in:
Michael Tryby
2019-03-05 14:49:42 -05:00
parent 651585fe32
commit 3c00e8e236
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@@ -48,8 +48,8 @@ script:
# run regression tests # run regression tests
- cd $EPANET_HOME - cd $EPANET_HOME
- pip install -r tools/requirements.txt - pip install -r tools/requirements.txt
- tools/before-test.sh $TEST_HOME $EPANET_HOME/$BUILD_HOME/bin $TRAVIS_COMMIT - tools/before-test.sh $REF_BUILD_ID $SUT_BUILD_ID $TRAVIS_COMMIT
- tools/run-nrtest.sh -c -t $TEST_HOME -v $TRAVIS_COMMIT - tools/run-nrtest.sh -c -r $REF_BUILD_ID -s $SUT_BUILD_ID
after_success: after_success:
- bash <(curl -s https://codecov.io/bash) - bash <(curl -s https://codecov.io/bash)

4
tools/run-nrtest.sh
View File

@@ -69,7 +69,7 @@ print_usage() {
# Default option values # Default option values
compare='true' compare='true'
ref_build_id= ref_build_id='unknown'
sut_build_id='local' sut_build_id='local'
test_path='nrtestsuite' test_path='nrtestsuite'
@@ -87,7 +87,7 @@ shift $(($OPTIND - 1))
# determine ref_build_id from manifest file # determine ref_build_id from manifest file
if [ -z $ref_build_id ]; then if [[ $ref_build_id == 'unknown' ]] && [[ $compare == 'true' ]]; then
description=(`cat ${test_path}/manifest.json | jq '.Application.description | splits(" ")'`) description=(`cat ${test_path}/manifest.json | jq '.Application.description | splits(" ")'`)
ref_build_id=${description[1]//\"/} ref_build_id=${description[1]//\"/}
fi fi