mirror of
https://github.com/gradle/actions.git
synced 2025-11-26 17:09:10 +08:00
Copy the raw JDK path into toolchains.xml
Previously we were relying on Gradle to substitute JDK environment variables in toolchains.xml. With this change, the actual path to the JDK is encoded instead. This should avoid issues where Gradle is not able to successfully resolve the envioronment variable.
This commit is contained in:
@@ -39,7 +39,7 @@ describe('predefined-toolchains', () => {
|
||||
<version>8</version>
|
||||
</provides>
|
||||
<configuration>
|
||||
<jdkHome>\${env.JAVA_HOME_8_X64}</jdkHome>
|
||||
<jdkHome>/jdks/foo_8</jdkHome>
|
||||
</configuration>
|
||||
</toolchain>
|
||||
<toolchain>
|
||||
@@ -48,7 +48,7 @@ describe('predefined-toolchains', () => {
|
||||
<version>11</version>
|
||||
</provides>
|
||||
<configuration>
|
||||
<jdkHome>\${env.JAVA_HOME_11_X64}</jdkHome>
|
||||
<jdkHome>/jdks/foo_11</jdkHome>
|
||||
</configuration>
|
||||
</toolchain>
|
||||
<toolchain>
|
||||
@@ -57,7 +57,7 @@ describe('predefined-toolchains', () => {
|
||||
<version>21</version>
|
||||
</provides>
|
||||
<configuration>
|
||||
<jdkHome>\${env.JAVA_HOME_21_ARM64}</jdkHome>
|
||||
<jdkHome>/jdks/foo_21</jdkHome>
|
||||
</configuration>
|
||||
</toolchain>
|
||||
</toolchains>
|
||||
@@ -81,7 +81,7 @@ describe('predefined-toolchains', () => {
|
||||
<version>8</version>
|
||||
</provides>
|
||||
<configuration>
|
||||
<jdkHome>\${env.JAVA_HOME_8_X64}</jdkHome>
|
||||
<jdkHome>/jdks/foo_8</jdkHome>
|
||||
</configuration>
|
||||
</toolchain>
|
||||
</toolchains>
|
||||
@@ -98,7 +98,7 @@ describe('predefined-toolchains', () => {
|
||||
<version>8</version>
|
||||
</provides>
|
||||
<configuration>
|
||||
<jdkHome>\${env.JAVA_HOME_8_X64}</jdkHome>
|
||||
<jdkHome>/jdks/foo_8</jdkHome>
|
||||
</configuration>
|
||||
</toolchain>
|
||||
|
||||
@@ -109,7 +109,7 @@ describe('predefined-toolchains', () => {
|
||||
<version>11</version>
|
||||
</provides>
|
||||
<configuration>
|
||||
<jdkHome>\${env.JAVA_HOME_11_X64}</jdkHome>
|
||||
<jdkHome>/jdks/foo_11</jdkHome>
|
||||
</configuration>
|
||||
</toolchain>
|
||||
</toolchains>
|
||||
|
||||
Reference in New Issue
Block a user