Skip to content

Commit 6d2a1c7

Browse files
committed
Install JDK
1 parent 0e40ad5 commit 6d2a1c7

File tree

1 file changed

+20
-18
lines changed

1 file changed

+20
-18
lines changed

.azure/pipelines/jobs/default-build.yml

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,8 @@ jobs:
131131
- DOTNET_CLI_HOME: $(System.DefaultWorkingDirectory)
132132
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
133133
- TeamName: AspNetCore
134-
- ${{ if eq(parameters.agentOs, 'Linux') }}:
135-
- LC_ALL: 'en_US.UTF-8'
136-
- LANG: 'en_US.UTF-8'
137-
- LANGUAGE: 'en_US.UTF-8'
134+
- ${{ if and(eq(parameters.installJdk, 'true'), eq(parameters.agentOs, 'Windows')) }}:
135+
- JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk\win-x64
138136
- ${{ if ne(parameters.codeSign, true) }}:
139137
- _SignType: ''
140138
- LC_ALL: 'en_US.UTF-8'
@@ -183,11 +181,14 @@ jobs:
183181
displayName: Install Node 20.x
184182
inputs:
185183
versionSpec: 20.x
186-
- ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}:
187-
- powershell: |
188-
Write-Host "##vso[task.setvariable variable=SeleniumProcessTrackingFolder]$(Build.SourcesDirectory)\artifacts\tmp\selenium\"
189-
./eng/scripts/InstallGoogleChrome.ps1
190-
displayName: Install Chrome
184+
- ${{ if and(eq(parameters.installJdk, 'true'), eq(parameters.agentOs, 'Windows')) }}:
185+
- powershell: ./eng/scripts/InstallJdk.ps1
186+
displayName: Install JDK 11
187+
- ${{ if eq(parameters.isAzDOTestingJob, true) }}:
188+
- powershell: |
189+
Write-Host "##vso[task.setvariable variable=SeleniumProcessTrackingFolder]$(Build.SourcesDirectory)\artifacts\tmp\selenium\"
190+
./eng/scripts/InstallGoogleChrome.ps1
191+
displayName: Install Chrome
191192
- ${{ if eq(parameters.agentOs, 'Windows') }}:
192193
- powershell: Write-Host "##vso[task.prependpath]$(DOTNET_CLI_HOME)\.dotnet\tools"
193194
displayName: Add dotnet tools to path
@@ -353,10 +354,8 @@ jobs:
353354
- DOTNET_CLI_HOME: $(System.DefaultWorkingDirectory)
354355
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
355356
- TeamName: AspNetCore
356-
- ${{ if eq(parameters.agentOs, 'Linux') }}:
357-
- LC_ALL: 'en_US.UTF-8'
358-
- LANG: 'en_US.UTF-8'
359-
- LANGUAGE: 'en_US.UTF-8'
357+
- ${{ if and(eq(parameters.installJdk, 'true'), eq(parameters.agentOs, 'Windows')) }}:
358+
- JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk\win-x64
360359
- ${{ if eq(parameters.codeSign, true) }}:
361360
- ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
362361
- _SignType: real
@@ -408,11 +407,14 @@ jobs:
408407
displayName: Install Node 20.x
409408
inputs:
410409
versionSpec: 20.x
411-
- ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.isAzDOTestingJob, true)) }}:
412-
- powershell: |
413-
Write-Host "##vso[task.setvariable variable=SeleniumProcessTrackingFolder]$(Build.SourcesDirectory)\artifacts\tmp\selenium\"
414-
./eng/scripts/InstallGoogleChrome.ps1
415-
displayName: Install Chrome
410+
- ${{ if and(eq(parameters.installJdk, 'true'), eq(parameters.agentOs, 'Windows')) }}:
411+
- powershell: ./eng/scripts/InstallJdk.ps1
412+
displayName: Install JDK 11
413+
- ${{ if eq(parameters.isAzDOTestingJob, true) }}:
414+
- powershell: |
415+
Write-Host "##vso[task.setvariable variable=SeleniumProcessTrackingFolder]$(Build.SourcesDirectory)\artifacts\tmp\selenium\"
416+
./eng/scripts/InstallGoogleChrome.ps1
417+
displayName: Install Chrome
416418
- ${{ if eq(parameters.agentOs, 'Windows') }}:
417419
- powershell: Write-Host "##vso[task.prependpath]$(DOTNET_CLI_HOME)\.dotnet\tools"
418420
displayName: Add dotnet tools to path

0 commit comments

Comments
 (0)