Skip to content

Commit 8fa26d5

Browse files
saibulususaibulusu
andauthored
JDK path changes (#296)
* Environment variable JAVA_HOME does not include 'bin' in path. * Trying to fix spaces problem. --------- Co-authored-by: saibulusu <[email protected]>
1 parent 460eb7d commit 8fa26d5

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.pipelines/azure-pipelines-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ resources:
1616
options: --entrypoint=""
1717

1818
variables:
19-
VcVersion : 1.14.14
19+
VcVersion : 1.14.15
2020
ROOT: $(Build.SourcesDirectory)
2121
CDP_DEFINITION_BUILD_COUNT: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
2222
ENABLE_PRS_DELAYSIGN: 1

.pipelines/azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pool:
1818
vmImage: windows-latest
1919

2020
variables:
21-
VcVersion : 1.14.14
21+
VcVersion : 1.14.15
2222
ROOT: $(Build.SourcesDirectory)
2323
CDP_DEFINITION_BUILD_COUNT: $[counter('', 0)] # needed for onebranch.pipeline.version task https://aka.ms/obpipelines/versioning
2424
ENABLE_PRS_DELAYSIGN: 1

src/VirtualClient/VirtualClient.Dependencies/JDKPackageDependencyInstallation.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ protected override async Task ExecuteAsync(EventContext telemetryContext, Cancel
8080
javaExecutable = this.PlatformSpecifics.Combine(javaDirectory, "java.exe");
8181
}
8282

83-
this.SetEnvironmentVariable(EnvironmentVariable.JAVA_HOME, javaDirectory, EnvironmentVariableTarget.Process);
83+
this.SetEnvironmentVariable(EnvironmentVariable.JAVA_HOME, jdkPackage.Path, EnvironmentVariableTarget.Process);
8484
this.SetEnvironmentVariable(EnvironmentVariable.JAVA_EXE, javaExecutable, EnvironmentVariableTarget.Process);
8585
this.SetEnvironmentVariable(EnvironmentVariable.PATH, javaDirectory, append: true);
8686

0 commit comments

Comments
 (0)