Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Disable cmd line shell exit for gradle re-try logic #1847

Merged
merged 1 commit into from
Jun 10, 2020
Merged

Disable cmd line shell exit for gradle re-try logic #1847

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion sbin/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,8 @@ buildSharedLibs() {
local gradleJavaHome=$(getGradleHome)
echo "Running gradle with $gradleJavaHome"


# Disable cmd line failure shell exit
set +e
gradlecount=1
rc=1
while [[ $rc -ne 0 && $gradlecount -le 3 ]]
Expand All @@ -448,6 +449,8 @@ buildSharedLibs() {
echo "gradle attempt $gradlecount : rc=$rc "
gradlecount=$(( gradlecount + 1 ))
done
# Re-enable cmd line failure shell exit
set -e

# Test that the parser can execute as fail fast rather than waiting till after the build to find out
"$gradleJavaHome"/bin/java -version 2>&1 | "$gradleJavaHome"/bin/java -cp "target/libs/adopt-shared-lib.jar" ParseVersion -s -f semver 1
Expand Down