Skip to content

Commit 47c380a

Browse files
Update CI config for Flutter 2 (flutter#3674)
Includes cleanup to simplify our setup. Major changes: - Eliminate the NNBD plugin filtering for stable. - Remove the temporarily-added beta branch testing. - Enable Linux, macOS, and web on stable (Windows is LUCI-based) - Combine the two different macOS matrix configurations now that they are the same. - Combine the two different Linux matrix configurations by using a single Dockerfile (which now also includes clang-format) - The web integration smoke test temporarily still uses the old Dockerfile, now renamed, because the driver installer script doesn't support Chrome 89 yet. - Move most of the Linux tasks to lower-CPU machines to allow more tasks to run in parallel without hitting the community limit. - Reorder the tasks slightly and give them comments to identify platform groupings - Enabled web "build all plugins together" and "build all examples" tests
1 parent 2518218 commit 47c380a

10 files changed

Lines changed: 261 additions & 195 deletions

File tree

.ci/Dockerfile

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RUN sudo apt-get install -y --no-install-recommends gnupg
66

77
# Add repo for gcloud sdk and install it
88
RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | \
9-
sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
9+
sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
1010

1111
RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \
1212
sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add -
@@ -23,7 +23,21 @@ RUN yes | sdkmanager \
2323

2424
RUN yes | sdkmanager --licenses
2525

26+
# Install formatter.
27+
RUN sudo apt-get install -y clang-format
28+
29+
# Install xvfb to allow running headless
30+
RUN sudo apt-get install -y xvfb libegl1-mesa
31+
# Install Linux desktop build tool requirements.
32+
RUN sudo apt-get install -y clang cmake ninja-build file pkg-config
33+
# Install necessary libraries.
34+
RUN sudo apt-get install -y libgtk-3-dev libblkid-dev liblzma-dev
35+
2636
# Add repo for Google Chrome and install it
2737
RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
2838
RUN echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' | sudo tee /etc/apt/sources.list.d/google-chrome.list
2939
RUN sudo apt-get update && sudo apt-get install -y --no-install-recommends google-chrome-stable
40+
41+
# Make Chrome the default so http: has a handler for url_launcher tests.
42+
RUN sudo apt-get install -y xdg-utils
43+
RUN xdg-settings set default-web-browser google-chrome.desktop
Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RUN sudo apt-get install -y --no-install-recommends gnupg
66

77
# Add repo for gcloud sdk and install it
88
RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | \
9-
sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
9+
sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
1010

1111
RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | \
1212
sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add -
@@ -15,17 +15,15 @@ RUN sudo apt-get update && sudo apt-get install -y google-cloud-sdk && \
1515
gcloud config set core/disable_usage_reporting true && \
1616
gcloud config set component_manager/disable_update_check true
1717

18-
# Install xvfb to allow running headless
19-
RUN sudo apt-get install -y xvfb libegl1-mesa
20-
# Install Linux desktop build tool requirements.
21-
RUN sudo apt-get install -y clang cmake ninja-build file pkg-config
22-
# Install necessary libraries.
23-
RUN sudo apt-get install -y libgtk-3-dev
18+
RUN yes | sdkmanager \
19+
"platforms;android-27" \
20+
"build-tools;27.0.3" \
21+
"extras;google;m2repository" \
22+
"extras;android;m2repository"
2423

25-
# Add repo for Google Chrome and install it, for url_launcher tests.
24+
RUN yes | sdkmanager --licenses
25+
26+
# Add repo for Google Chrome and install it
2627
RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
2728
RUN echo 'deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main' | sudo tee /etc/apt/sources.list.d/google-chrome.list
2829
RUN sudo apt-get update && sudo apt-get install -y --no-install-recommends google-chrome-stable
29-
# Make it the default so http: has a handler.
30-
RUN sudo apt-get install -y xdg-utils
31-
RUN xdg-settings set default-web-browser google-chrome.desktop

0 commit comments

Comments
 (0)