Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NodeJS Upgrade] Resolve Windows chromium path and add jdk20 tool on Jenkins #301

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions packer/scripts/windows/scoop-install-commons.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,8 @@ $chromiumName = 'chrome.exe'
$chromiumDir = 'C:\\Users\\Administrator\\scoop\\apps\\chromium'
$chromiumFound = (Get-ChildItem -Path $chromiumDir -Filter $chromiumName -Recurse | %{$_.FullName} | select -first 1)
$chromiumFound
$chromiumPathFound = $chromiumFound.replace("$chromiumName", '')
$chromiumPathFound
# Add BROWSER_PATH path to User Env Var for cypress test to retrieve chromium.exe path
[System.Environment]::SetEnvironmentVariable("BROWSER_PATH", "$chromiumPathFound", [System.EnvironmentVariableTarget]::User)
[System.Environment]::SetEnvironmentVariable("BROWSER_PATH", "$chromiumFound", [System.EnvironmentVariableTarget]::User)

# Install ruby24
scoop install ruby24
Expand Down
6 changes: 6 additions & 0 deletions resources/baseJenkins.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,12 @@ tool:
installers:
- adoptOpenJdkInstaller:
id: "jdk-19.0.1+10"
- name: "openjdk-20"
properties:
- installSource:
installers:
- adoptOpenJdkInstaller:
id: "jdk-20.0.1+9"
mavenGlobalConfig:
globalSettingsProvider: "standard"
settingsProvider: "standard"
Expand Down