File tree Expand file tree Collapse file tree 3 files changed +11
-22
lines changed Expand file tree Collapse file tree 3 files changed +11
-22
lines changed Original file line number Diff line number Diff line change @@ -3,10 +3,6 @@ sudo: false
33jdk :
44- oraclejdk7
55env :
6- matrix :
7- - GRADLE_FLAGS="--stacktrace " GRADLE_CMD="test -x grails-test-suite-web:test"
8- - GRADLE_FLAGS="--stacktrace" GRADLE_CMD="grails-test-suite-web:test"
9- - GRADLE_FLAGS="--stacktrace --info" GRADLE_CMD="integrationTest"
106 global :
117 - TERM=dumb
128 - MALLOC_ARENA_MAX=1
@@ -34,13 +30,8 @@ install: /bin/true
3430script :
3531- ./travis-build.sh
3632after_success :
37- - python ./travis/travis_after_all.py
38- - export $(cat .to_export_back)
39- - ./travis-publish-archives.sh
4033- ./trigger-dependent-build.sh
4134after_failure :
42- - python ./travis/travis_after_all.py
43- - export $(cat .to_export_back)
4435- ./travis-after-failure.sh
4536deploy :
4637 provider : releases
Original file line number Diff line number Diff line change @@ -18,10 +18,20 @@ EXIT_STATUS=0
1818
1919if [[ $TRAVIS_TAG =~ ^v[[:digit:]] ]]; then
2020 echo " Tagged Release Skipping Tests for Publish"
21+ ./travis-publish-archives.sh
2122else
2223 echo " Executing tests"
23- ./gradlew $GRADLE_FLAGS $GRADLE_CMD || EXIT_STATUS=$?
24+ ./gradlew --stacktrace test -x grails-test-suite-web:test || EXIT_STATUS=$?
25+ if [[ $EXIT_STATUS == 0 ]]; then
26+ ./gradlew --stop
27+ ./gradlew --stacktrace grails-test-suite-web:test || EXIT_STATUS=$?
28+ fi
2429 echo " Done."
30+ if [[ $EXIT_STATUS == 0 ]]; then
31+ echo " Executing integration tests"
32+ ./gradlew --stacktrace --info integrationTest || EXIT_STATUS=$?
33+ echo " Done."
34+ fi
2535fi
2636
2737export EXIT_STATUS
Original file line number Diff line number Diff line change 99echo " Project Version: '$grailsVersion '"
1010echo " EXIT STATUS of build: '$EXIT_STATUS '"
1111
12- # use travis_after_all.py for publishing only after all builds are successful.
13- if [[ " $BUILD_LEADER " == " YES" ]]; then
14- if [[ " $BUILD_AGGREGATE_STATUS " != " others_succeeded" ]]; then
15- echo " Some builds failed, not publishing."
16- exit 0
17- fi
18- else
19- # not build leader, exit
20- echo " Not build leader, exiting"
21- exit 0
22- fi
23-
2412
2513if [[ $TRAVIS_PULL_REQUEST == ' false'
2614 && $TRAVIS_REPO_SLUG == grails/grails-core
You can’t perform that action at this time.
0 commit comments