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

Commit 1b4e0d7

Browse files
author
David Roume
committed
Merge commit 'e872833efb3b51e5e55f9b63ccf41c896b28bdb8'
Conflicts: packages/camera/camera/pubspec.yaml
2 parents 18bb963 + e872833 commit 1b4e0d7

File tree

2,159 files changed

+115551
-20310
lines changed

Some content is hidden

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

2,159 files changed

+115551
-20310
lines changed

‎.ci.yaml‎

Lines changed: 8 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,17 @@ enabled_branches:
1111
platform_properties:
1212
linux:
1313
properties:
14-
caches: >-
15-
[
16-
]
1714
dependencies: >
1815
[
19-
{"dependency": "curl"}
16+
{"dependency": "curl", "version": "version:7.64.0"}
2017
]
2118
device_type: none
2219
os: Linux
2320
windows:
2421
properties:
25-
caches: >-
26-
[
27-
{"name": "vsbuild", "path": "vsbuild"},
28-
{"name": "pub_cache", "path": ".pub-cache"}
29-
]
3022
dependencies: >
3123
[
32-
{"dependency": "certs"}
24+
{"dependency": "certs", "version": "version:9563bb"}
3325
]
3426
device_type: none
3527
os: Windows
@@ -45,7 +37,7 @@ targets:
4537
version_file: flutter_master.version
4638
dependencies: >
4739
[
48-
{"dependency": "vs_build"}
40+
{"dependency": "vs_build", "version": "version:vs2019"}
4941
]
5042
5143
- name: Windows win32-platform_tests stable
@@ -55,9 +47,10 @@ targets:
5547
add_recipes_cq: "true"
5648
target_file: windows_build_and_platform_tests.yaml
5749
channel: stable
50+
version_file: flutter_stable.version
5851
dependencies: >
5952
[
60-
{"dependency": "vs_build"}
53+
{"dependency": "vs_build", "version": "version:vs2019"}
6154
]
6255
6356
- name: Windows windows-build_all_plugins master
@@ -70,7 +63,7 @@ targets:
7063
version_file: flutter_master.version
7164
dependencies: >
7265
[
73-
{"dependency": "vs_build"}
66+
{"dependency": "vs_build", "version": "version:vs2019"}
7467
]
7568
7669
- name: Windows windows-build_all_plugins stable
@@ -80,22 +73,10 @@ targets:
8073
add_recipes_cq: "true"
8174
target_file: build_all_plugins.yaml
8275
channel: stable
76+
version_file: flutter_stable.version
8377
dependencies: >
8478
[
85-
{"dependency": "vs_build"}
86-
]
87-
88-
- name: Windows uwp-platform_tests master
89-
recipe: plugins/plugins
90-
timeout: 30
91-
properties:
92-
add_recipes_cq: "true"
93-
target_file: uwp_build_and_platform_tests.yaml
94-
channel: master
95-
version_file: flutter_master.version
96-
dependencies: >
97-
[
98-
{"dependency": "vs_build"}
79+
{"dependency": "vs_build", "version": "version:vs2019"}
9980
]
10081
10182
- name: Windows plugin_tools_tests

‎.ci/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# The Flutter version is not important here, since the CI scripts update Flutter
22
# before running. What matters is that the base image is pinned to minimize
33
# unintended changes when modifying this file.
4-
FROM cirrusci/flutter:2.8.0
4+
FROM cirrusci/flutter@sha256:505fe8bce2896c75b4df9ccf500b1604155bf932af7465ffcc66fcae8612f82f
55

66
RUN apt-get update -y
77

‎.ci/flutter_master.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
509ddfda5c1bda7c01cf51fe24607da19423d5f9
1+
7b6074fbc542efb41da5618bc97711fac6ab7dee

‎.ci/flutter_stable.version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
e3c29ec00c9c825c891d75054c63fcc46454dca1

‎.ci/scripts/build_examples_uwp.sh‎

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

‎.ci/scripts/prepare_tool.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# found in the LICENSE file.
55

66
# To set FETCH_HEAD for "git merge-base" to work
7-
git fetch origin master
7+
git fetch origin main
88

99
cd script/tool
1010
dart pub get

‎.ci/targets/uwp_build_and_platform_tests.yaml‎

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

0 commit comments

Comments
 (0)