Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to fix download cache on CI

Browse Source 
See gh-37450
This commit is contained in:
Phillip Webb 2023-10-10 11:46:20 -07:00
parent 6df5389d76
commit f04d354c29
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ci/scripts/common.sh
View File

@ -1,5 +1,9 @@
source /opt/concourse-java.sh
if [[ -d $PWD/gradle ]]; then
EXPORT GRADLE_USER_HOMR=`pwd`/gradle
fi
setup_symlinks
if [[ -d $PWD/embedmongo && ! -d $HOME/.embedmongo ]]; then
ln -s "$PWD/embedmongo" "$HOME/.embedmongo"

2
ci/tasks/build-project.yml
View File

@ -7,7 +7,7 @@ outputs:
- name: git-repo
caches:
- path: gradle
- path: build/downloads
- path: maven
- path: embedmongo
params:
BRANCH:

4
spring-boot-tests/spring-boot-integration-tests/spring-boot-launch-script-tests/build.gradle
View File

@ -43,7 +43,7 @@ task buildApp(type: GradleBuild) {
}
task downloadJdk(type: Download) {
def destFolder = new File(rootProject.buildDir, "downloads/jdk/bellsoft")
def destFolder = new File(project.gradle.gradleUserHomeDir, "caches/springboot/downloads/jdk/bellsoft")
destFolder.mkdirs()
src "https://download.bell-sw.com/java/${jdkVersion}/bellsoft-jdk${jdkVersion}-linux-${jdkArch}.tar.gz"
dest destFolder
@ -53,7 +53,7 @@ task downloadJdk(type: Download) {
task syncJdkDownloads(type: Sync) {
dependsOn downloadJdk
from "${rootProject.buildDir}/downloads/jdk/bellsoft/"
from "${project.gradle.gradleUserHomeDir}/caches/springboot/downloads/jdk/bellsoft/"
include "bellsoft-jdk${jdkVersion}-linux-${jdkArch}.tar.gz"
into "${project.buildDir}/downloads/jdk/bellsoft/"
}

4
spring-boot-tests/spring-boot-integration-tests/spring-boot-loader-tests/build.gradle
View File

@ -44,7 +44,7 @@ task buildApp(type: GradleBuild) {
}
task downloadJdk(type: Download) {
def destFolder = new File(rootProject.buildDir, "downloads/jdk/oracle")
def destFolder = new File(project.gradle.gradleUserHomeDir, "caches/springboot/downloads/jdk/oracle")
destFolder.mkdirs()
src "https://download.oracle.com/java/17/archive/jdk-${oracleJdkVersion}_linux-${oracleJdkArch}_bin.tar.gz"
dest destFolder
@ -54,7 +54,7 @@ task downloadJdk(type: Download) {
task syncJdkDownloads(type: Sync) {
dependsOn downloadJdk
from "${rootProject.buildDir}/downloads/jdk/oracle/"
from "${project.gradle.gradleUserHomeDir}/caches/springboot/downloads/jdk/oracle/"
include "jdk-${oracleJdkVersion}_linux-${oracleJdkArch}_bin.tar.gz"
into "${project.buildDir}/downloads/jdk/oracle/"
}