Attempt to fix download cache on CI

See gh-37450
2.7.x
Phillip Webb 1 year ago
parent 6df5389d76
commit f04d354c29

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

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

@ -43,7 +43,7 @@ task buildApp(type: GradleBuild) {
} }
task downloadJdk(type: Download) { 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() destFolder.mkdirs()
src "https://download.bell-sw.com/java/${jdkVersion}/bellsoft-jdk${jdkVersion}-linux-${jdkArch}.tar.gz" src "https://download.bell-sw.com/java/${jdkVersion}/bellsoft-jdk${jdkVersion}-linux-${jdkArch}.tar.gz"
dest destFolder dest destFolder
@ -53,7 +53,7 @@ task downloadJdk(type: Download) {
task syncJdkDownloads(type: Sync) { task syncJdkDownloads(type: Sync) {
dependsOn downloadJdk 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" include "bellsoft-jdk${jdkVersion}-linux-${jdkArch}.tar.gz"
into "${project.buildDir}/downloads/jdk/bellsoft/" into "${project.buildDir}/downloads/jdk/bellsoft/"
} }

@ -44,7 +44,7 @@ task buildApp(type: GradleBuild) {
} }
task downloadJdk(type: Download) { 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() destFolder.mkdirs()
src "https://download.oracle.com/java/17/archive/jdk-${oracleJdkVersion}_linux-${oracleJdkArch}_bin.tar.gz" src "https://download.oracle.com/java/17/archive/jdk-${oracleJdkVersion}_linux-${oracleJdkArch}_bin.tar.gz"
dest destFolder dest destFolder
@ -54,7 +54,7 @@ task downloadJdk(type: Download) {
task syncJdkDownloads(type: Sync) { task syncJdkDownloads(type: Sync) {
dependsOn downloadJdk 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" include "jdk-${oracleJdkVersion}_linux-${oracleJdkArch}_bin.tar.gz"
into "${project.buildDir}/downloads/jdk/oracle/" into "${project.buildDir}/downloads/jdk/oracle/"
} }

Loading…
Cancel
Save