actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-12 12:06:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

[macOS] Add Edge browser to arm64 images. (#12759)

Browse Source
This commit is contained in:
susmitamane
2025-08-14 14:37:20 +05:30
committed by GitHub
parent 9d9a63ab45
commit f899392729
7 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
images/macos/scripts/build/configure-machine.sh
View File

@@ -103,3 +103,7 @@ if [[ ! -d "/usr/local/bin" ]];then
fi fi
chmod +x $HOME/utils/invoke-tests.sh chmod +x $HOME/utils/invoke-tests.sh
sudo ln -s $HOME/utils/invoke-tests.sh /usr/local/bin/invoke_tests sudo ln -s $HOME/utils/invoke-tests.sh /usr/local/bin/invoke_tests
# Fix share dir permissions
sudo chown "$USER":admin /usr/local/share
sudo chmod 775 /usr/local/share

7
images/macos/scripts/build/install-edge.sh
View File

@@ -19,7 +19,12 @@ echo "Installing Microsoft Edge WebDriver..."
edge_driver_version_file_path=$(download_with_retry "https://msedgedriver.microsoft.com/LATEST_RELEASE_${edge_version_major}_MACOS") edge_driver_version_file_path=$(download_with_retry "https://msedgedriver.microsoft.com/LATEST_RELEASE_${edge_version_major}_MACOS")
edge_driver_latest_version=$(iconv -f utf-16 -t utf-8 "$edge_driver_version_file_path" | tr -d '\r') edge_driver_latest_version=$(iconv -f utf-16 -t utf-8 "$edge_driver_version_file_path" | tr -d '\r')
edge_driver_url="https://msedgedriver.microsoft.com/${edge_driver_latest_version}/edgedriver_mac64.zip"
if is_Arm64; then
edge_driver_url="https://msedgedriver.microsoft.com/${edge_driver_latest_version}/edgedriver_mac64_m1.zip"
else
edge_driver_url="https://msedgedriver.microsoft.com/${edge_driver_latest_version}/edgedriver_mac64.zip"
fi
echo "Compatible version of WebDriver: ${edge_driver_latest_version}" echo "Compatible version of WebDriver: ${edge_driver_latest_version}"

4
images/macos/scripts/docs-gen/SoftwareReport.Browsers.psm1
View File

@@ -9,10 +9,6 @@ function Build-BrowserSection {
[ToolVersionNode]::new("Google Chrome", $(Get-ChromeVersion)) [ToolVersionNode]::new("Google Chrome", $(Get-ChromeVersion))
[ToolVersionNode]::new("Google Chrome for Testing", $(Get-ChromeForTestingVersion)) [ToolVersionNode]::new("Google Chrome for Testing", $(Get-ChromeForTestingVersion))
[ToolVersionNode]::new("ChromeDriver", $(Get-ChromeDriverVersion)) [ToolVersionNode]::new("ChromeDriver", $(Get-ChromeDriverVersion))
)
if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64) -and (-not $os.IsSequoiaArm64)) {
$nodes += @(
[ToolVersionNode]::new("Microsoft Edge", $(Get-EdgeVersion)) [ToolVersionNode]::new("Microsoft Edge", $(Get-EdgeVersion))
[ToolVersionNode]::new("Microsoft Edge WebDriver", $(Get-EdgeDriverVersion)) [ToolVersionNode]::new("Microsoft Edge WebDriver", $(Get-EdgeDriverVersion))
) )

2
images/macos/scripts/tests/Browsers.Tests.ps1
View File

@@ -41,7 +41,7 @@ Describe "Selenium server" {
} }
} }
Describe "Edge" -Skip:($os.IsVenturaArm64 -or $os.IsSonomaArm64 -or $os.IsSequoiaArm64) { Describe "Edge" {
It "Microsoft Edge" { It "Microsoft Edge" {
$edgeLocation = "/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge" $edgeLocation = "/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge"
$edgeLocation | Should -Exist $edgeLocation | Should -Exist

3
images/macos/templates/macOS-13.arm64.anka.pkr.hcl
View File

@@ -249,7 +249,8 @@ build {
"${path.root}/../scripts/build/install-chrome.sh", "${path.root}/../scripts/build/install-chrome.sh",
"${path.root}/../scripts/build/install-firefox.sh", "${path.root}/../scripts/build/install-firefox.sh",
"${path.root}/../scripts/build/install-bicep.sh", "${path.root}/../scripts/build/install-bicep.sh",
"${path.root}/../scripts/build/install-codeql-bundle.sh" "${path.root}/../scripts/build/install-codeql-bundle.sh",
"${path.root}/../scripts/build/install-edge.sh"
] ]
} }

3
images/macos/templates/macOS-14.arm64.anka.pkr.hcl
View File

@@ -249,7 +249,8 @@ build {
"${path.root}/../scripts/build/install-chrome.sh", "${path.root}/../scripts/build/install-chrome.sh",
"${path.root}/../scripts/build/install-firefox.sh", "${path.root}/../scripts/build/install-firefox.sh",
"${path.root}/../scripts/build/install-bicep.sh", "${path.root}/../scripts/build/install-bicep.sh",
"${path.root}/../scripts/build/install-codeql-bundle.sh" "${path.root}/../scripts/build/install-codeql-bundle.sh",
"${path.root}/../scripts/build/install-edge.sh"
] ]
} }

3
images/macos/templates/macOS-15.arm64.anka.pkr.hcl
View File

@@ -248,7 +248,8 @@ build {
"${path.root}/../scripts/build/install-chrome.sh", "${path.root}/../scripts/build/install-chrome.sh",
"${path.root}/../scripts/build/install-firefox.sh", "${path.root}/../scripts/build/install-firefox.sh",
"${path.root}/../scripts/build/install-bicep.sh", "${path.root}/../scripts/build/install-bicep.sh",
"${path.root}/../scripts/build/install-codeql-bundle.sh" "${path.root}/../scripts/build/install-codeql-bundle.sh",
"${path.root}/../scripts/build/install-edge.sh"
] ]
} }