Skip to content

Commit 6fbc9f9

Browse files
[ci] Remove unused Chromium setup (flutter#4437)
The tasks that used the Cirrus template and shell script to install a specific version of Chromium have been migrated to LUCI, so this is cruft; I forgot to remove it when finishing that migration. Also combines two setup steps into one template now that they are only used together.
1 parent bd5d191 commit 6fbc9f9

File tree

2 files changed

+5
-74
lines changed

2 files changed

+5
-74
lines changed

.cirrus.yml

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,7 @@ env:
66
CHANNEL: "master" # Default to master when not explicitly set by a task.
77
PLUGIN_TOOL_COMMAND: "dart ./script/tool/bin/flutter_plugin_tools.dart"
88

9-
install_chrome_linux_template: &INSTALL_CHROME_LINUX
10-
env:
11-
CHROME_NO_SANDBOX: true
12-
CHROME_DOWNLOAD_DIR: /tmp/chromium
13-
CHROME_EXECUTABLE: $CHROME_DOWNLOAD_DIR/chrome-linux/chrome
14-
CHROMEDRIVER_EXECUTABLE: $CHROME_DOWNLOAD_DIR/chromedriver/chromedriver
15-
PATH: $PATH:$CHROME_DOWNLOAD_DIR/chrome-linux
16-
install_chromium_script:
17-
# Install a pinned version of Chromium and its corresponding ChromeDriver.
18-
# Setting CHROME_EXECUTABLE above causes this version to be used for tests.
19-
- ./script/install_chromium.sh
20-
21-
tool_setup_template: &TOOL_SETUP_TEMPLATE
22-
tool_setup_script:
23-
- .ci/scripts/prepare_tool.sh
24-
25-
flutter_upgrade_template: &FLUTTER_UPGRADE_TEMPLATE
9+
setup_template: &SETUP_TEMPLATE
2610
upgrade_flutter_script:
2711
# Channels that are part of our normal test matrix use a pinned,
2812
# auto-rolled version to prevent out-of-band CI failures due to changes in
@@ -45,13 +29,14 @@ flutter_upgrade_template: &FLUTTER_UPGRADE_TEMPLATE
4529
- fi
4630
# Run doctor to allow auditing of what version of Flutter the run is using.
4731
- flutter doctor -v
48-
<< : *TOOL_SETUP_TEMPLATE
32+
tool_setup_script:
33+
- .ci/scripts/prepare_tool.sh
4934

5035
# Light-workload Linux tasks.
5136
# These use default machines, with fewer CPUs, to reduce pressure on the
5237
# concurrency limits.
5338
task:
54-
<< : *FLUTTER_UPGRADE_TEMPLATE
39+
<< : *SETUP_TEMPLATE
5540
gke_container:
5641
dockerfile: .ci/Dockerfile
5742
builder_image_name: docker-builder-linux # gce vm image
@@ -129,7 +114,7 @@ task:
129114
# These use machines with more CPUs and memory, so will reduce parallelization
130115
# for non-credit runs.
131116
task:
132-
<< : *FLUTTER_UPGRADE_TEMPLATE
117+
<< : *SETUP_TEMPLATE
133118
gke_container:
134119
dockerfile: .ci/Dockerfile
135120
builder_image_name: docker-builder-linux # gce vm image

script/install_chromium.sh

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
 (0)