From 59451e6cb3b44c5a4786abb38e7f8a5cf2a87c1d Mon Sep 17 00:00:00 2001 From: Joey Parrish Date: Tue, 6 Feb 2024 10:53:05 -0800 Subject: [PATCH] ci: Restore Edge on Windows in the lab (#6220) By specifying the binary path and also merging https://github.com/shaka-project/shaka-lab/pull/47, we are able to restore Edge on Windows in the lab. --- build/shaka-lab.yaml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/build/shaka-lab.yaml b/build/shaka-lab.yaml index 72b5fc423d..884fb8c32f 100644 --- a/build/shaka-lab.yaml +++ b/build/shaka-lab.yaml @@ -68,6 +68,18 @@ vars: ms:edgeOptions: binary: /usr/bin/microsoft-edge + # Work around https://github.com/MicrosoftEdge/EdgeWebDriver/issues/102#issuecomment-1710724173 + # by specifying the binary path on Mac. + edge_mac_config: &edge_mac_config + ms:edgeOptions: + binary: /Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge + + # Work around https://github.com/MicrosoftEdge/EdgeWebDriver/issues/102#issuecomment-1710724173 + # by specifying the binary path on Mac. + edge_windows_config: &edge_windows_config + ms:edgeOptions: + binary: "C:/Program Files (x86)/Microsoft/Edge/Application/msedge.exe" + android_chrome_config: &android_chrome_config goog:chromeOptions: args: @@ -132,6 +144,7 @@ EdgeMac: os: Mac extra_configs: - *basic_edge_config + - *edge_mac_config Safari: browser: safari @@ -161,12 +174,11 @@ FirefoxWindows: - *basic_firefox_config Edge: - # TODO(b/323916397): Edge on Windows not working currently - disabled: true browser: msedge os: Windows extra_configs: - *basic_edge_config + - *edge_windows_config ### Linux ###