Skip to content

Commit c889363

Browse files
committed
chore: Drop org.gradle.java.installations toolchain restriction for local env, but keep them in CI
1 parent 470c6e7 commit c889363

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

.gitlab-ci.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,12 @@ default:
171171
- export ORG_GRADLE_PROJECT_akkaRepositoryToken=$(aws ssm get-parameter --region us-east-1 --name ci.dd-trace-java.akka_repo_token --with-decryption --query "Parameter.Value" --out text)
172172
- export ORG_GRADLE_PROJECT_mavenRepositoryProxy=$MAVEN_REPOSITORY_PROXY
173173
- export ORG_GRADLE_PROJECT_gradlePluginProxy=$GRADLE_PLUGIN_PROXY
174-
- export ORG_GRADLE_PROJECT_org.gradle.java.installations.auto-detect=false
175-
- export ORG_GRADLE_PROJECT_org.gradle.java.installations.auto-download=false
176-
- export ORG_GRADLE_PROJECT_org.gradle.java.installations.fromEnv=JAVA_8_HOME,JAVA_11_HOME,JAVA_17_HOME,JAVA_21_HOME,JAVA_25_HOME
174+
- |
175+
cat >> gradle.properties <<'EOF'
176+
org.gradle.java.installations.auto-detect=false
177+
org.gradle.java.installations.auto-download=false
178+
org.gradle.java.installations.fromEnv=JAVA_8_HOME,JAVA_11_HOME,JAVA_17_HOME,JAVA_21_HOME,JAVA_25_HOME
179+
EOF
177180
- mkdir -p .gradle
178181
- export GRADLE_USER_HOME=$(pwd)/.gradle
179182
# replace maven central part by MAVEN_REPOSITORY_PROXY in .mvn/wrapper/maven-wrapper.properties

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ org.gradle.parallel=true
22
org.gradle.caching=true
33
org.gradle.jvmargs=-XX:MaxMetaspaceSize=1g
44

5-
# CI use constrained org.gradle.java.installations settings
6-
75
# Toggle on to get more details during IJ sync
86
#org.gradle.logging.level=info
7+
8+
# CI use constrained org.gradle.java.installations settings

0 commit comments

Comments
 (0)