Skip to content

Commit 0f3945a

Browse files
committed
Remove use of temporary directories ('/tmp/geode/*') for bulid artifacts.
The 'gradle.user.home' JVM System property no longer seems valid in Gradle 7.x.
1 parent cd91699 commit 0f3945a

File tree

4 files changed

+4
-7
lines changed

4 files changed

+4
-7
lines changed

ci/check.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
set -eou pipefail
44

5-
GRADLE_OPTS="-Duser.name=jenkins -Djava.io.tmpdir=/tmp -Dgradle.user.home=/tmp/geode/boot/build-gradle-cache" \
5+
GRADLE_OPTS="-Duser.name=jenkins -Djava.io.tmpdir=/tmp" \
66
./gradlew clean check --no-daemon --refresh-dependencies --stacktrace

ci/deployArtifacts.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ echo "Deploying artifacts on host [$HOSTNAME]"
99
# Syntax: `chown -R userId:groupId .`
1010
chown -R 1001:1001 .
1111

12-
GRADLE_OPTS="-Duser.name=jenkins -Djava.io.tmpdir=/tmp -Dgradle.user.home=/tmp/geode/boot/artifacts-gradle-cache" \
12+
GRADLE_OPTS="-Duser.name=jenkins -Djava.io.tmpdir=/tmp" \
1313
./gradlew publishArtifacts releasePublishedArtifacts --no-build-cache --no-configuration-cache --no-daemon --stacktrace \
1414
-PartifactoryUsername=$ARTIFACTORY_USERNAME \
1515
-PartifactoryPassword=$ARTIFACTORY_PASSWORD \

ci/deployDocs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ echo "Deploying docs on host [$HOSTNAME]"
99
# Syntax: `chown -R userId:groupId .`
1010
chown -R 1001:1001 .
1111

12-
GRADLE_OPTS="--add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED -Duser.name=jenkins -Djava.io.tmpdir=/tmp -Dgradle.user.home=/tmp/geode/boot/docs-gradle-cache" \
12+
GRADLE_OPTS="--add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED -Duser.name=jenkins -Djava.io.tmpdir=/tmp" \
1313
./gradlew deployDocs --no-daemon --stacktrace \
1414
-PdeployDocsSshKeyPath=$DEPLOY_SSH_KEY \
1515
-PdeployDocsSshUsername=$SPRING_DOCS_USERNAME

ci/setup.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,8 @@
44
# Group ID 1001 is "jenkins"
55
# Syntax: `chown -R userId:groupId .`
66

7-
echo "Logged in as user [$USER] with home directory [$HOME] in the current working directory [$PWD]"
7+
echo "Logged into Jenkins CI as user [$USER] with home directory [$HOME] in the current working directory [$PWD]"
88
chown -R 1001:1001 .
9-
mkdir -p /tmp/geode/boot/artifacts-gradle-cache
10-
mkdir -p /tmp/geode/boot/build-gradle-cache
11-
mkdir -p /tmp/geode/boot/docs-gradle-cache
129
echo "Logging into Docker..."
1310
docker login --username ${DOCKER_HUB_USR} --password ${DOCKER_HUB_PSW}
1411
exit 0

0 commit comments

Comments
 (0)