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

Commit 6a22ec3

Browse files
author
jonahwilliams
committed
Merge branch 'blender_filter' of github.com:jonahwilliams/engine into blender_filter
2 parents 630a194 + 1221a84 commit 6a22ec3

6 files changed

Lines changed: 109 additions & 76 deletions

File tree

.ci.yaml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ platform_properties:
5555
cpu: x86
5656
os: Mac-12
5757
xcode: 14a5294e # xcode 14.0 beta 5
58+
dimensions:
59+
mac_model: "Macmini8,1|Macmini9,1"
5860
windows:
5961
properties:
6062
build_host: "false"
@@ -204,7 +206,6 @@ targets:
204206
- name: Linux Host clang-tidy
205207
recipe: engine/engine_lint
206208
properties:
207-
add_recipes_cq: "true"
208209
cores: "32"
209210
lint_android: "false"
210211
lint_host: "true"
@@ -224,7 +225,6 @@ targets:
224225
- name: Linux Android clang-tidy
225226
recipe: engine/engine_lint
226227
properties:
227-
add_recipes_cq: "true"
228228
cores: "32"
229229
lint_android: "true"
230230
lint_host: "false"
@@ -352,6 +352,7 @@ targets:
352352
timeout: 60
353353
properties:
354354
release_build: "true"
355+
cpu: arm64
355356
config_name: mac_host_engine
356357
dependencies: >-
357358
[
@@ -367,6 +368,14 @@ targets:
367368
add_recipes_cq: "true"
368369
timeout: 60
369370

371+
- name: Linux mac_unopt
372+
bringup: true
373+
recipe: engine_v2/engine_v2
374+
properties:
375+
config_name: mac_unopt
376+
add_recipes_cq: "true"
377+
timeout: 60
378+
370379
- name: Mac Unopt
371380
bringup: true
372381
recipe: engine/engine_unopt
@@ -382,8 +391,6 @@ targets:
382391
- name: Mac Host clang-tidy
383392
recipe: engine/engine_lint
384393
properties:
385-
add_recipes_cq: "true"
386-
cores: "8"
387394
cpu: arm64
388395
lint_host: "true"
389396
lint_ios: "false"
@@ -405,7 +412,6 @@ targets:
405412
- name: Mac iOS clang-tidy
406413
recipe: engine/engine_lint
407414
properties:
408-
add_recipes_cq: "true"
409415
cpu: arm64
410416
lint_host: "false"
411417
lint_ios: "true"

DEPS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ vars = {
1818
'llvm_git': 'https://llvm.googlesource.com',
1919
# OCMock is for testing only so there is no google clone
2020
'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
21-
'skia_revision': '2bd12e31d5781f50ffdda7a7ce9081b3f6850488',
21+
'skia_revision': 'f489b4a06e1900f597e4261848d3b0382a18d851',
2222

2323
# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
2424
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -47,7 +47,7 @@ vars = {
4747
# Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
4848
# You can use //tools/dart/create_updated_flutter_deps.py to produce
4949
# updated revision list of existing dependencies.
50-
'dart_revision': '36b37d0a8db733098dc42f93c46829e5815655d7',
50+
'dart_revision': 'afb0adeca5b61290db3cfac78a59816aba79af1e',
5151

5252
# WARNING: DO NOT EDIT MANUALLY
5353
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -460,7 +460,7 @@ deps = {
460460
Var('dart_git') + '/test_reflective_loader.git@a85a930ad3736f93b96f6cc104d3576c1ae19e0e',
461461

462462
'src/third_party/dart/third_party/pkg/tools':
463-
Var('dart_git') + '/tools.git@58d914764eab030bf537c2c58089c8ba7b46a313',
463+
Var('dart_git') + '/tools.git@2308c672e0d7446f5bfdba96594b41f26fa24a2e',
464464

465465
'src/third_party/dart/third_party/pkg/typed_data':
466466
Var('dart_git') + '/typed_data.git@d85363d2efb333afce07ec409a529ec32986e1a2',

0 commit comments

Comments
 (0)