Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish "Add Java 14 CI"

Browse Source 
See gh-20413
This commit is contained in:
Stephane Nicoll
2020-03-18 14:26:04 +01:00
parent f0e57ed688
commit 8d3ab1cc7d
11 changed files with 10 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ci/scripts/build-project.sh
View File

@@ -5,14 +5,5 @@ source $(dirname $0)/common.sh
repository=$(pwd)/distribution-repository
pushd git-repo > /dev/null
if [[ -d /opt/openjdk-secondary ]]; then
java_version=$( ./$(dirname $0)/get-secondary-java-version.sh )
if [[ ${java_version} = "14" ]]; then
./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false --no-daemon --max-workers=4 -PtestJavaHome=/opt/openjdk-secondary -PdeploymentRepository=${repository} build publishAllPublicationsToDeploymentRepository -x :spring-boot-project:spring-boot-tools:spring-boot-gradle-plugin:test
else
./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false --no-daemon --max-workers=4 -PtestJavaHome=/opt/openjdk-secondary -PdeploymentRepository=${repository} build publishAllPublicationsToDeploymentRepository
fi
else
./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false --no-daemon --max-workers=4 -PdeploymentRepository=${repository} build publishAllPublicationsToDeploymentRepository
fi
./gradlew -Dorg.gradle.internal.launcher.welcomeMessageEnabled=false --no-daemon --max-workers=4 -PdeploymentRepository=${repository} build publishAllPublicationsToDeploymentRepository
popd > /dev/null

4
ci/scripts/detect-jdk-updates.sh
View File

@@ -14,7 +14,7 @@ case "$JDK_VERSION" in
ISSUE_TITLE="Upgrade Java 13 version in CI image"
;;
java14)
BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/14/ea"
BASE_URL="https://api.adoptopenjdk.net/v3/assets/feature_releases/14"
ISSUE_TITLE="Upgrade Java 14 version in CI image"
;;
*)
@@ -22,7 +22,7 @@ case "$JDK_VERSION" in
exit 1;
esac
response=$( curl -s ${BASE_URL}\?architecture\=x64\&heap_size\=normal\&image_type\=jdk\&jvm_impl\=hotspot\&os\=linux\&sort_order\=DESC\&vendor\=adoptopenjdk )
response=$( curl -s ${BASE_URL}\/ga\?architecture\=x64\&heap_size\=normal\&image_type\=jdk\&jvm_impl\=hotspot\&os\=linux\&sort_order\=DESC\&vendor\=adoptopenjdk )
latest=$( jq -r '.[0].binaries[0].package.link' <<< "$response" )
current=$( git-repo/ci/images/get-jdk-url.sh ${JDK_VERSION} )

4
ci/scripts/get-secondary-java-version.sh
View File

@@ -1,4 +0,0 @@
#!/bin/bash
set -e
/opt/openjdk-secondary/bin/java -XshowSettings:properties -version 2>&1 | grep "java.specification.version" | awk '{split($0,parts,"="); print parts[2]}' | awk '{$1=$1;print}'