Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Switch to Chrome For Testing instead of Chromium #46683

Merged
auto-submit merged 7 commits into from
Oct 11, 2023
Merged

Switch to Chrome For Testing instead of Chromium #46683

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
529daec
Update browser roller and launcher.
eyebrowsoffire Oct 9, 2023
b3ab7d9
Update Chrome version.
eyebrowsoffire Oct 9, 2023
f215a41
Fix capitalization issues.
eyebrowsoffire Oct 9, 2023
2e28fbe
Fix mac path when rolling.
eyebrowsoffire Oct 9, 2023
642b041
Bump to Chrome 118
eyebrowsoffire Oct 10, 2023
d10bb7a
Merge branch 'main' into chrome_for_testing
eyebrowsoffire Oct 10, 2023
27e9a6c
Fix comments and update the docs.
eyebrowsoffire Oct 11, 2023
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
2 changes: 1 addition & 1 deletion .ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ targets:
{"download_emsdk": true}
dependencies: >-
[
{"dependency": "chrome_and_driver", "version": "version:117.0"},
{"dependency": "chrome_and_driver", "version": "version:118.0.5993.70"},
{"dependency": "curl", "version": "version:7.64.0"}
]
framework: "true"
Expand Down
58 changes: 29 additions & 29 deletions ci/builders/linux_web_engine.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@
},
{
"dependency": "chrome_and_driver",
"version": "version:117.0"
"version": "118.0.5993.70"
}
],
"tasks": [
Expand Down Expand Up @@ -391,7 +391,7 @@
},
{
"dependency": "chrome_and_driver",
"version": "version:117.0"
"version": "118.0.5993.70"
}
],
"tasks": [
Expand Down Expand Up @@ -427,7 +427,7 @@
},
{
"dependency": "chrome_and_driver",
"version": "version:117.0"
"version": "118.0.5993.70"
}
],
"tasks": [
Expand Down Expand Up @@ -463,7 +463,7 @@
},
{
"dependency": "chrome_and_driver",
"version": "version:117.0"
"version": "118.0.5993.70"
}
],
"tasks": [
Expand Down Expand Up @@ -499,7 +499,7 @@
},
{
"dependency": "chrome_and_driver",
"version": "version:117.0"
"version": "118.0.5993.70"
}
],
"tasks": [
Expand Down Expand Up @@ -535,7 +535,7 @@
},
{
"dependency": "chrome_and_driver",
"version": "version:117.0"
"version": "118.0.5993.70"
}
],
"tasks": [
Expand Down Expand Up @@ -571,7 +571,7 @@
},
{
"dependency": "chrome_and_driver",
"version": "version:117.0"
"version": "118.0.5993.70"
}
],
"tasks": [
Expand Down Expand Up @@ -607,7 +607,7 @@
},
{
"dependency": "chrome_and_driver",
"version": "version:117.0"
"version": "118.0.5993.70"
}
],
"tasks": [
Expand Down Expand Up @@ -823,7 +823,7 @@
},
{
"dependency": "chrome_and_driver",
"version": "version:117.0"
"version": "118.0.5993.70"
}
],
"tasks": [
Expand Down Expand Up @@ -859,7 +859,7 @@
},
{
"dependency": "chrome_and_driver",
"version": "version:117.0"
"version": "118.0.5993.70"
}
],
"tasks": [
Expand Down Expand Up @@ -895,7 +895,7 @@
},
{
"dependency": "chrome_and_driver",
"version": "version:117.0"
"version": "118.0.5993.70"
}
],
"tasks": [
Expand Down Expand Up @@ -931,7 +931,7 @@
},
{
"dependency": "chrome_and_driver",
"version": "version:117.0"
"version": "118.0.5993.70"
}
],
"tasks": [
Expand Down Expand Up @@ -967,7 +967,7 @@
},
{
"dependency": "chrome_and_driver",
"version": "version:117.0"
"version": "118.0.5993.70"
}
],
"tasks": [
Expand Down Expand Up @@ -1003,7 +1003,7 @@
},
{
"dependency": "chrome_and_driver",
"version": "version:117.0"
"version": "118.0.5993.70"
}
],
"tasks": [
Expand Down Expand Up @@ -1039,7 +1039,7 @@
},
{
"dependency": "chrome_and_driver",
"version": "version:117.0"
"version": "118.0.5993.70"
}
],
"tasks": [
Expand Down Expand Up @@ -1075,7 +1075,7 @@
},
{
"dependency": "chrome_and_driver",
"version": "version:117.0"
"version": "118.0.5993.70"
}
],
"tasks": [
Expand All @@ -1095,7 +1095,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
"os=Mac"
],
"gclient_variables": {
"download_android_deps": false
Expand Down Expand Up @@ -1127,7 +1127,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
"os=Mac"
],
"gclient_variables": {
"download_android_deps": false
Expand Down Expand Up @@ -1159,7 +1159,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
"os=Mac"
],
"gclient_variables": {
"download_android_deps": false
Expand Down Expand Up @@ -1191,7 +1191,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
"os=Mac"
],
"gclient_variables": {
"download_android_deps": false
Expand Down Expand Up @@ -1223,7 +1223,7 @@
"recipe": "engine_v2/tester_engine",
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
"os=Mac"
],
"gclient_variables": {
"download_android_deps": false
Expand Down Expand Up @@ -1271,7 +1271,7 @@
},
{
"dependency": "chrome_and_driver",
"version": "version:117.0"
"version": "118.0.5993.70"
}
],
"tasks": [
Expand Down Expand Up @@ -1307,7 +1307,7 @@
},
{
"dependency": "chrome_and_driver",
"version": "version:117.0"
"version": "118.0.5993.70"
}
],
"tasks": [
Expand Down Expand Up @@ -1343,7 +1343,7 @@
},
{
"dependency": "chrome_and_driver",
"version": "version:117.0"
"version": "118.0.5993.70"
}
],
"tasks": [
Expand Down Expand Up @@ -1379,7 +1379,7 @@
},
{
"dependency": "chrome_and_driver",
"version": "version:117.0"
"version": "118.0.5993.70"
}
],
"tasks": [
Expand Down Expand Up @@ -1415,7 +1415,7 @@
},
{
"dependency": "chrome_and_driver",
"version": "version:117.0"
"version": "118.0.5993.70"
}
],
"tasks": [
Expand Down Expand Up @@ -1451,7 +1451,7 @@
},
{
"dependency": "chrome_and_driver",
"version": "version:117.0"
"version": "118.0.5993.70"
}
],
"tasks": [
Expand Down Expand Up @@ -1487,7 +1487,7 @@
},
{
"dependency": "chrome_and_driver",
"version": "version:117.0"
"version": "118.0.5993.70"
}
],
"tasks": [
Expand Down Expand Up @@ -1523,7 +1523,7 @@
},
{
"dependency": "chrome_and_driver",
"version": "version:117.0"
"version": "118.0.5993.70"
}
],
"tasks": [
Expand Down
16 changes: 1 addition & 15 deletions lib/web_ui/dev/browser_lock.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import 'dart:io' as io;
import 'package:path/path.dart' as path;
import 'package:yaml/yaml.dart';

import 'common.dart';
import 'environment.dart';

/// Returns the browser configuration based on the `browser_lock.yaml` file in
Expand Down Expand Up @@ -36,23 +35,10 @@ class BrowserLock {

class ChromeLock {
ChromeLock._fromYaml(YamlMap yaml) :
linux = (yaml['Linux'] as int).toString(),
mac = (yaml['Mac'] as int).toString(),
macArm = (yaml['Mac_Arm'] as int).toString(),
windows = (yaml['Win'] as int).toString(),
version = yaml['version'] as String;

final String linux;
final String mac;
final String macArm;
final String windows;
/// The major version of Chromium represented by this lock. E.g: '96' (for Chromium 96.0.554.51)
/// The full version of Chromium represented by this lock. E.g: '119.0.6045.9'
final String version;

/// Return the Chromium Build ID to use for the current operating system.
String get versionForCurrentPlatform {
return PlatformBinding.instance.getChromeBuild(this);
}
}

class FirefoxLock {
Expand Down
18 changes: 1 addition & 17 deletions lib/web_ui/dev/browser_lock.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,7 @@
# Please refer to the "Upgrade Browser Version" section in the README.md for
# more details on how to update browser version numbers.
chrome:
# It seems Chrome can't always release from the same build for all operating
# systems, so we specify per-OS build number.
#
# Follow these instructions to find the correct build number for a specific
# Chromium version + OS combo:
#
# https://www.chromium.org/getting-involved/download-chromium/#downloading-old-builds-of-chrome-chromium
#
# The OS names here must match what recipe Python expression
# `self.m.platform.name.capitalize()` evaluates to. See:
#
# recipe_modules/web_util/api.py
Linux: 1181205
Mac: 1181205
Mac_Arm: 1181212
Win: 1181217
version: '117.0' # CIPD tag for the above Build IDs. Normally "ChromeMajorVersion.UploadAttempt". ;)
version: '118.0.5993.70'

@yjbanov yjbanov Oct 11, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

\o/


firefox:
version: '106.0'
Expand Down
Loading