This repository was archived by the owner on Feb 25, 2025. It is now read-only.
File tree Expand file tree Collapse file tree 5 files changed +3
-50
lines changed Expand file tree Collapse file tree 5 files changed +3
-50
lines changed Original file line number Diff line number Diff line change @@ -273,8 +273,6 @@ targets:
273
273
{"download_emsdk": true}
274
274
dependencies : >-
275
275
[
276
- {"dependency": "chrome_and_driver", "version": "version:107.0"},
277
- {"dependency": "firefox", "version": "version:83.0"},
278
276
{"dependency": "goldctl", "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"}
279
277
]
280
278
timeout : 60
@@ -503,10 +501,6 @@ targets:
503
501
gclient_variables : >-
504
502
{"download_emsdk": true}
505
503
gcs_goldens_bucket : flutter_logs
506
- dependencies : >-
507
- [
508
- {"dependency": "chrome_and_driver", "version": "version:107.0"}
509
- ]
510
504
timeout : 60
511
505
runIf :
512
506
- DEPS
Original file line number Diff line number Diff line change @@ -153,20 +153,6 @@ We test with Firefox on LUCI in the Linux Web Engine builder. The process for
153
153
rolling Firefox is even easier than Chromium. Simply update ` browser_lock.yaml `
154
154
with the latest version of Firefox, and run ` browser_roller.dart ` .
155
155
156
- #### .ci.yaml
157
-
158
- After rolling Chrome and/or Firefox, also update the CI dependencies in
159
- ` .ci.yaml ` to make use of the new versions. The lines look like
160
-
161
- ``` yaml
162
- dependencies : >-
163
- [
164
- {"dependency": "chrome_and_driver", "version": "version:107.0"},
165
- {"dependency": "firefox", "version": "version:83.0"},
166
- {"dependency": "goldctl", "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"}
167
- ]
168
- ` ` `
169
-
170
156
##### ** browser_roller.dart**
171
157
172
158
The script has the following command-line options:
Original file line number Diff line number Diff line change @@ -15,8 +15,6 @@ import 'common.dart';
15
15
import 'environment.dart' ;
16
16
import 'exceptions.dart' ;
17
17
18
- const String _chromeExecutableVar = 'CHROME_EXECUTABLE' ;
19
-
20
18
/// Returns the installation of Chrome, installing it if necessary.
21
19
///
22
20
/// If [requestedVersion] is null, uses the version specified on the
@@ -35,18 +33,6 @@ Future<BrowserInstallation> getOrInstallChrome(
35
33
}) async {
36
34
infoLog ?? = io.stdout;
37
35
38
- // When running on LUCI, if we specify the "chrome_and_driver" dependency,
39
- // then the bot will download Chrome from CIPD and place it in a cache and
40
- // set the environment variable CHROME_EXECUTABLE.
41
- if (io.Platform .environment.containsKey (_chromeExecutableVar)) {
42
- infoLog.writeln ('Using Chrome from $_chromeExecutableVar variable: '
43
- '${io .Platform .environment [_chromeExecutableVar ]}' );
44
- return BrowserInstallation (
45
- version: 'cipd' ,
46
- executable: io.Platform .environment[_chromeExecutableVar]! ,
47
- );
48
- }
49
-
50
36
if (requestedVersion == 'system' ) {
51
37
return BrowserInstallation (
52
38
version: 'system' ,
Original file line number Diff line number Diff line change @@ -22,7 +22,7 @@ class FirefoxEnvironment implements BrowserEnvironment {
22
22
23
23
@override
24
24
Future <Browser > launchBrowserInstance (Uri url, {bool debug = false }) async {
25
- return Firefox (url, _installation , debug: debug);
25
+ return Firefox (url, this , debug: debug);
26
26
}
27
27
28
28
@override
@@ -56,7 +56,8 @@ class FirefoxEnvironment implements BrowserEnvironment {
56
56
class Firefox extends Browser {
57
57
/// Starts a new instance of Firefox open to the given [url] , which may be a
58
58
/// [Uri] or a [String] .
59
- factory Firefox (Uri url, BrowserInstallation installation, {bool debug = false }) {
59
+ factory Firefox (Uri url, FirefoxEnvironment firefoxEnvironment, {bool debug = false }) {
60
+ final BrowserInstallation installation = firefoxEnvironment._installation;
60
61
final Completer <Uri > remoteDebuggerCompleter = Completer <Uri >.sync ();
61
62
return Firefox ._(BrowserProcess (() async {
62
63
// Using a profile on opening will prevent popups related to profiles.
Original file line number Diff line number Diff line change @@ -11,8 +11,6 @@ import 'common.dart';
11
11
import 'environment.dart' ;
12
12
import 'exceptions.dart' ;
13
13
14
- const String _firefoxExecutableVar = 'FIREFOX_EXECUTABLE' ;
15
-
16
14
/// Returns the installation of Firefox, installing it if necessary.
17
15
///
18
16
/// If [requestedVersion] is null, uses the version specified on the
@@ -38,18 +36,6 @@ Future<BrowserInstallation> getOrInstallFirefox(
38
36
39
37
infoLog ?? = io.stdout;
40
38
41
- // When running on LUCI, if we specify the "firefox" dependency, then the
42
- // bot will download Firefox from CIPD and place it in a cache and set the
43
- // environment variable FIREFOX_EXECUTABLE.
44
- if (io.Platform .environment.containsKey (_firefoxExecutableVar)) {
45
- infoLog.writeln ('Using Firefox from $_firefoxExecutableVar variable: '
46
- '${io .Platform .environment [_firefoxExecutableVar ]}' );
47
- return BrowserInstallation (
48
- version: 'cipd' ,
49
- executable: io.Platform .environment[_firefoxExecutableVar]! ,
50
- );
51
- }
52
-
53
39
if (requestedVersion == 'system' ) {
54
40
return BrowserInstallation (
55
41
version: 'system' ,
You can’t perform that action at this time.
0 commit comments