Skip to content

Commit 36d75b8

Browse files
committed
Release Grails 3.2.0.RC1
1 parent 6cf62cf commit 36d75b8

File tree

3 files changed

+11
-22
lines changed

3 files changed

+11
-22
lines changed

.travis.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ sudo: false
33
jdk:
44
- oraclejdk7
55
env:
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
3430
script:
3531
- ./travis-build.sh
3632
after_success:
37-
- python ./travis/travis_after_all.py
38-
- export $(cat .to_export_back)
39-
- ./travis-publish-archives.sh
4033
- ./trigger-dependent-build.sh
4134
after_failure:
42-
- python ./travis/travis_after_all.py
43-
- export $(cat .to_export_back)
4435
- ./travis-after-failure.sh
4536
deploy:
4637
provider: releases

travis-build.sh

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,20 @@ EXIT_STATUS=0
1818

1919
if [[ $TRAVIS_TAG =~ ^v[[:digit:]] ]]; then
2020
echo "Tagged Release Skipping Tests for Publish"
21+
./travis-publish-archives.sh
2122
else
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
2535
fi
2636

2737
export EXIT_STATUS

travis-publish-archives.sh

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,6 @@ set -x
99
echo "Project Version: '$grailsVersion'"
1010
echo "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

2513
if [[ $TRAVIS_PULL_REQUEST == 'false'
2614
&& $TRAVIS_REPO_SLUG == grails/grails-core

0 commit comments

Comments
 (0)