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

Commit df4cc8d

Browse files
committed
Merge branch 'main' into implicit_view_tests
2 parents 1748dfb + 7eb6b7c commit df4cc8d

File tree

277 files changed

+5158
-2790
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

277 files changed

+5158
-2790
lines changed

.ci.yaml

Lines changed: 0 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,6 @@ enabled_branches:
1313
platform_properties:
1414
linux:
1515
properties:
16-
build_host: "false"
17-
build_fuchsia: "false"
18-
build_android_debug: "false"
19-
build_android_aot: "false"
20-
build_android_vulkan: "false"
21-
build_ios: "false"
22-
build_android_jit_release: "false"
23-
gcs_goldens_bucket: ""
24-
ios_debug: "false"
25-
ios_profile: "false"
26-
ios_release: "false"
2716
# CIPD flutter/java/openjdk/$platform
2817
dependencies: >-
2918
[
@@ -35,17 +24,6 @@ platform_properties:
3524
cores: "8"
3625
mac:
3726
properties:
38-
build_host: "false"
39-
build_fuchsia: "false"
40-
build_android_debug: "false"
41-
build_android_aot: "false"
42-
build_android_vulkan: "false"
43-
build_ios: "false"
44-
build_android_jit_release: "false"
45-
gcs_goldens_bucket: ""
46-
ios_debug: "false"
47-
ios_profile: "false"
48-
ios_release: "false"
4927
# CIPD flutter/java/openjdk/$platform
5028
dependencies: >-
5129
[
@@ -65,17 +43,6 @@ platform_properties:
6543
mac_model: "Macmini8,1|Macmini9,1"
6644
windows:
6745
properties:
68-
build_host: "false"
69-
build_fuchsia: "false"
70-
build_android_debug: "false"
71-
build_android_aot: "false"
72-
build_android_vulkan: "false"
73-
build_ios: "false"
74-
build_android_jit_release: "false"
75-
gcs_goldens_bucket: ""
76-
ios_debug: "false"
77-
ios_profile: "false"
78-
ios_release: "false"
7946
# CIPD flutter/java/openjdk/$platform
8047
dependencies: >-
8148
[
@@ -164,25 +131,6 @@ targets:
164131
config_name: linux_benchmarks
165132
timeout: 60
166133

167-
- name: Linux Fuchsia
168-
bringup: true
169-
recipe: engine/engine
170-
properties:
171-
build_fuchsia: "true"
172-
fuchsia_ctl_version: version:0.0.27
173-
# ensure files from pre-production Fuchsia SDK tests are purged from cache
174-
clobber: "true"
175-
timeout: 90
176-
# TODO(https://github.com/flutter/flutter/issues/138559): Re-enable/delete.
177-
# runIfNot:
178-
# - lib/web_ui/**
179-
# - shell/platform/android/**
180-
# - shell/platform/darwin/**
181-
# - shell/platform/glfw/**
182-
# - shell/platform/linux/**
183-
# - shell/platform/windows/**
184-
# - web_sdk/**
185-
186134
- name: Linux Fuchsia FEMU
187135
recipe: engine/femu_test
188136
properties:
@@ -251,7 +199,6 @@ targets:
251199

252200
- name: Linux linux_clang_tidy
253201
recipe: engine_v2/engine_v2
254-
presubmit: false
255202
timeout: 120
256203
properties:
257204
config_name: linux_clang_tidy
@@ -268,24 +215,6 @@ targets:
268215
- "**.frag"
269216
- "**.vert"
270217

271-
- name: Linux linux_clang_tidy_presubmit
272-
recipe: engine_v2/engine_v2
273-
timeout: 120
274-
properties:
275-
config_name: linux_clang_tidy_presubmit
276-
runIf:
277-
- DEPS
278-
- .ci.yaml
279-
- tools/clang_tidy/**
280-
- ci/builders/**
281-
- ci/clang_tidy.sh
282-
- "**.h"
283-
- "**.c"
284-
- "**.cc"
285-
- "**.fbs"
286-
- "**.frag"
287-
- "**.vert"
288-
289218
- name: Linux linux_arm_host_engine
290219
recipe: engine_v2/engine_v2
291220
timeout: 120
@@ -406,7 +335,6 @@ targets:
406335

407336
- name: Mac mac_clang_tidy
408337
recipe: engine_v2/engine_v2
409-
presubmit: false
410338
timeout: 120
411339
properties:
412340
config_name: mac_clang_tidy
@@ -425,26 +353,6 @@ targets:
425353
- "**.m"
426354
- "**.mm"
427355

428-
- name: Mac mac_clang_tidy_presubmit
429-
recipe: engine_v2/engine_v2
430-
timeout: 120
431-
properties:
432-
config_name: mac_clang_tidy_presubmit
433-
runIf:
434-
- DEPS
435-
- .ci.yaml
436-
- tools/clang_tidy/**
437-
- ci/builders/**
438-
- ci/clang_tidy.sh
439-
- "**.h"
440-
- "**.c"
441-
- "**.cc"
442-
- "**.fbs"
443-
- "**.frag"
444-
- "**.vert"
445-
- "**.m"
446-
- "**.mm"
447-
448356
- name: Mac mac_host_engine
449357
recipe: engine_v2/engine_v2
450358
timeout: 120

.github/labeler.yml

Lines changed: 36 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,57 @@
44

55
# See https://github.com/actions/labeler/blob/main/README.md for docs.
66
'affects: desktop':
7-
- shell/platform/darwin/common/**/*
8-
- shell/platform/darwin/macos/**/*
9-
- shell/platform/linux/**/*
10-
- shell/platform/windows/**/*
7+
- changed-files:
8+
- any-glob-to-any-file:
9+
- shell/platform/darwin/common/**/*
10+
- shell/platform/darwin/macos/**/*
11+
- shell/platform/linux/**/*
12+
- shell/platform/windows/**/*
1113

1214
embedder:
13-
- shell/platform/embedder
15+
- changed-files:
16+
- any-glob-to-any-file:
17+
- shell/platform/embedder
1418

1519
'e: impeller':
16-
- impeller/**/*
20+
- changed-files:
21+
- any-glob-to-any-file:
22+
- impeller/**/*
1723

1824
platform-android:
19-
- shell/platform/android/**/*
25+
- changed-files:
26+
- any-glob-to-any-file:
27+
- shell/platform/android/**/*
2028

2129
platform-ios:
22-
- shell/platform/darwin/common/**/*
23-
- shell/platform/darwin/ios/**/*
30+
- changed-files:
31+
- any-glob-to-any-file:
32+
- shell/platform/darwin/common/**/*
33+
- shell/platform/darwin/ios/**/*
2434

2535
platform-fuchsia:
26-
- shell/platform/fuchsia/**/*
36+
- changed-files:
37+
- any-glob-to-any-file:
38+
- shell/platform/fuchsia/**/*
2739

2840
platform-linux:
29-
- shell/platform/linux/**/*
41+
- changed-files:
42+
- any-glob-to-any-file:
43+
- shell/platform/linux/**/*
3044

3145
platform-macos:
32-
- shell/platform/darwin/common/**/*
33-
- shell/platform/darwin/macos/**/*
46+
- changed-files:
47+
- any-glob-to-any-file:
48+
- shell/platform/darwin/common/**/*
49+
- shell/platform/darwin/macos/**/*
3450

3551
platform-web:
36-
- lib/web_ui/**/*
37-
- '**/web_sdk/**/*'
52+
- changed-files:
53+
- any-glob-to-any-file:
54+
- lib/web_ui/**/*
55+
- '**/web_sdk/**/*'
3856

3957
platform-windows:
40-
- shell/platform/windows/**/*
58+
- changed-files:
59+
- any-glob-to-any-file:
60+
- shell/platform/windows/**/*

.github/workflows/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
# Source available at https://github.com/actions/labeler/blob/main/README.md
20-
- uses: actions/labeler@ac9175f8a1f3625fd0d4fb234536d26811351594
20+
- uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9

0 commit comments

Comments
 (0)