From 3d37654160db0a8ed422f3c9007c18caa544087e Mon Sep 17 00:00:00 2001 From: Stuart Morgan Date: Mon, 19 Jun 2023 19:09:05 -0400 Subject: [PATCH] [ci] Switch Linux and web build-all to LUCI Enables the recently added LUCI build-all for Linux and web, and removes the Cirrus version. Also enables an iOS build-all task that was never enabled. Part of https://github.com/flutter/flutter/issues/114373 --- .ci.yaml | 7 ++----- .cirrus.yml | 15 --------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 8dc53d81b7c..620432aca17 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -81,16 +81,15 @@ targets: ### Web tasks ### - name: Linux_web web_build_all_packages master - bringup: true # New target recipe: packages/packages timeout: 30 properties: + add_recipes_cq: "true" version_file: flutter_master.version target_file: web_build_all_packages.yaml channel: master - name: Linux_web web_build_all_packages stable - bringup: true # New target recipe: packages/packages timeout: 30 properties: @@ -100,16 +99,15 @@ targets: ### Linux desktop tasks - name: Linux_desktop build_all_packages master - bringup: true # New target recipe: packages/packages timeout: 30 properties: + add_recipes_cq: "true" version_file: flutter_master.version target_file: linux_build_all_packages.yaml channel: master - name: Linux_desktop build_all_packages stable - bringup: true # New target recipe: packages/packages timeout: 30 properties: @@ -203,7 +201,6 @@ targets: target_file: ios_build_all_packages.yaml - name: Mac_x64 ios_build_all_packages stable - bringup: true # New target recipe: packages/packages timeout: 30 properties: diff --git a/.cirrus.yml b/.cirrus.yml index d7ee3cc6ff0..0808a1cabb5 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -176,22 +176,7 @@ task: env: CIRRUS_CLONE_SUBMODULES: true script: ./script/tool_runner.sh update-excerpts --fail-on-change - ### Web tasks ### - - name: web-build_all_packages - env: - BUILD_ALL_ARGS: "web" - matrix: - CHANNEL: "master" - CHANNEL: "stable" - << : *BUILD_ALL_PACKAGES_APP_TEMPLATE ### Linux desktop tasks ### - - name: linux-build_all_packages - env: - BUILD_ALL_ARGS: "linux" - matrix: - CHANNEL: "master" - CHANNEL: "stable" - << : *BUILD_ALL_PACKAGES_APP_TEMPLATE - name: linux-platform_tests # Don't run full platform tests on both channels in pre-submit. skip: $CIRRUS_PR != '' && $CHANNEL == 'stable'