junos
/
rapids
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Travis false passing error 1.2

pull/103/head
kaguillera 2020-10-09 11:51:36 -04:00
parent 65cc3c01ac
commit a7f2909645
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -38,7 +38,8 @@ jobs:
- "$HOME/.local/share/renv" - "$HOME/.local/share/renv"
- "$TRAVIS_BUILD_DIR/renv/library" - "$TRAVIS_BUILD_DIR/renv/library"
script: script:
- bash tests/scripts/run_tests.sh all test - bash tests/scripts/run_tests.sh all test
# - bash tests/scripts/run_tests.sh periodic test && tests/scripts/run_tests.sh frequency test
- name: Python 3.7 on macOS - name: Python 3.7 on macOS
os: osx os: osx
osx_image: xcode11.3 osx_image: xcode11.3
@ -69,7 +70,8 @@ jobs:
- "$RENV_PATHS_ROOT" - "$RENV_PATHS_ROOT"
- "$TRAVIS_BUILD_DIR/renv/library" - "$TRAVIS_BUILD_DIR/renv/library"
script: script:
- bash tests/scripts/run_tests.sh periodic test && tests/scripts/run_tests.sh frequency test - bash tests/scripts/run_tests.sh all test
# - bash tests/scripts/run_tests.sh periodic test # && tests/scripts/run_tests.sh frequency test
- stage: deploy - stage: deploy
name: Python 3.7 on Xenial Linux Docker name: Python 3.7 on Xenial Linux Docker
os: linux os: linux

9
tests/scripts/run_tests.sh
View File

@ -74,8 +74,7 @@ then
display_usage display_usage
elif [ $1 == 'all' ] elif [ $1 == 'all' ]
then then
run_periodic_pipeline || travis_terminate 1; run_periodic_pipeline && run_frequency_pipeline
run_frequency_pipeline
elif [ $1 == 'periodic' ] elif [ $1 == 'periodic' ]
then then
run_periodic_pipeline run_periodic_pipeline
@ -92,8 +91,7 @@ then
clean_old_data clean_old_data
if [ $2 == 'all' ] if [ $2 == 'all' ]
then then
run_periodic_pipeline run_periodic_pipeline && run_frequency_pipeline
run_frequency_pipeline
if [ $# -gt 2 ] && [ $3 == 'test' ] if [ $# -gt 2 ] && [ $3 == 'test' ]
then then
run_periodic_test run_periodic_test
@ -123,8 +121,7 @@ then
run_frequency_pipeline run_frequency_pipeline
if [ $2 == 'test' ] if [ $2 == 'test' ]
then then
run_periodic_test || travis_terminate 1; run_periodic_test && run_frequency_test
run_frequency_test
else else
display_usage display_usage
fi fi