Reland: [flutter_tool] Download gen_snapshot.zip for macOS desktop (#97671)

This commit is contained in:
Zachary Anderson 2022-02-02 14:43:55 -08:00 committed by GitHub
parent 54f674c23a
commit e50ca9acbc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 31 additions and 9 deletions

View file

@ -382,7 +382,7 @@ targets:
- packages/fuchsia_remote_debug_protocol/
- packages/flutter_test/
- packages/flutter_goldens/
- packages/flutter_tools/lib/src/test/
- packages/flutter_tools/
- bin/
- .ci.yaml
@ -413,7 +413,7 @@ targets:
- packages/fuchsia_remote_debug_protocol/
- packages/flutter_test/
- packages/flutter_goldens/
- packages/flutter_tools/lib/src/test/
- packages/flutter_tools/
- bin/
- .ci.yaml
@ -439,7 +439,7 @@ targets:
- packages/fuchsia_remote_debug_protocol/
- packages/flutter_test/
- packages/flutter_goldens/
- packages/flutter_tools/lib/src/test/
- packages/flutter_tools/
- bin/
- .ci.yaml
@ -2491,7 +2491,7 @@ targets:
- packages/fuchsia_remote_debug_protocol/**
- packages/flutter_test/**
- packages/flutter_goldens/**
- packages/flutter_tools/lib/src/test/**
- packages/flutter_tools/**
- bin/**
- .ci.yaml
@ -2521,7 +2521,7 @@ targets:
- packages/fuchsia_remote_debug_protocol/**
- packages/flutter_test/**
- packages/flutter_goldens/**
- packages/flutter_tools/lib/src/test/**
- packages/flutter_tools/**
- bin/**
- .ci.yaml
@ -2547,7 +2547,7 @@ targets:
- packages/fuchsia_remote_debug_protocol/**
- packages/flutter_test/**
- packages/flutter_goldens/**
- packages/flutter_tools/lib/src/test/**
- packages/flutter_tools/**
- bin/**
- .ci.yaml
@ -3663,7 +3663,7 @@ targets:
- packages/fuchsia_remote_debug_protocol/
- packages/flutter_test/
- packages/flutter_goldens/
- packages/flutter_tools/lib/src/test/
- packages/flutter_tools/
- bin/
- .ci.yaml
@ -3692,7 +3692,7 @@ targets:
- packages/fuchsia_remote_debug_protocol/
- packages/flutter_test/
- packages/flutter_goldens/
- packages/flutter_tools/lib/src/test/
- packages/flutter_tools/
- bin/
- .ci.yaml
@ -3718,7 +3718,7 @@ targets:
- packages/fuchsia_remote_debug_protocol/
- packages/flutter_test/
- packages/flutter_goldens/
- packages/flutter_tools/lib/src/test/
- packages/flutter_tools/
- bin/
- .ci.yaml

View file

@ -143,9 +143,15 @@ class CodesignCommand extends Command<void> {
'artifacts/engine/android-x64-profile/darwin-x64/gen_snapshot',
'artifacts/engine/android-x64-release/darwin-x64/gen_snapshot',
'artifacts/engine/darwin-x64-profile/gen_snapshot',
'artifacts/engine/darwin-x64-profile/gen_snapshot_arm64',
'artifacts/engine/darwin-x64-profile/gen_snapshot_x64',
'artifacts/engine/darwin-x64-release/gen_snapshot',
'artifacts/engine/darwin-x64-release/gen_snapshot_arm64',
'artifacts/engine/darwin-x64-release/gen_snapshot_x64',
'artifacts/engine/darwin-x64/flutter_tester',
'artifacts/engine/darwin-x64/gen_snapshot',
'artifacts/engine/darwin-x64/gen_snapshot_arm64',
'artifacts/engine/darwin-x64/gen_snapshot_x64',
'artifacts/engine/ios-profile/gen_snapshot_arm64',
'artifacts/engine/ios-profile/gen_snapshot_armv7',
'artifacts/engine/ios-release/gen_snapshot_arm64',

View file

@ -870,10 +870,13 @@ const List<List<String>> _windowsUwpDesktopBinaryDirs = <List<String>>[
const List<List<String>> _macOSDesktopBinaryDirs = <List<String>>[
<String>['darwin-x64', 'darwin-x64/FlutterMacOS.framework.zip'],
<String>['darwin-x64', 'darwin-x64/gen_snapshot.zip'],
<String>['darwin-x64-profile', 'darwin-x64-profile/FlutterMacOS.framework.zip'],
<String>['darwin-x64-profile', 'darwin-x64-profile/artifacts.zip'],
<String>['darwin-x64-profile', 'darwin-x64-profile/gen_snapshot.zip'],
<String>['darwin-x64-release', 'darwin-x64-release/FlutterMacOS.framework.zip'],
<String>['darwin-x64-release', 'darwin-x64-release/artifacts.zip'],
<String>['darwin-x64-release', 'darwin-x64-release/gen_snapshot.zip'],
];
const List<List<String>> _osxBinaryDirs = <List<String>>[

View file

@ -557,6 +557,19 @@ void main() {
]);
});
testWithoutContext('macOS desktop artifacts include all gen_snapshot binaries', () {
final Cache cache = Cache.test(processManager: FakeProcessManager.any());
final MacOSEngineArtifacts artifacts = MacOSEngineArtifacts(cache, platform: FakePlatform());
cache.includeAllPlatforms = false;
cache.platformOverrideArtifacts = <String>{'macos'};
expect(artifacts.getBinaryDirs(), containsAll(<List<String>>[
<String>['darwin-x64', 'darwin-x64/gen_snapshot.zip'],
<String>['darwin-x64-profile', 'darwin-x64-profile/gen_snapshot.zip'],
<String>['darwin-x64-release', 'darwin-x64-release/gen_snapshot.zip'],
]));
});
testWithoutContext('macOS desktop artifacts ignore filtering when requested', () {
final Cache cache = Cache.test(processManager: FakeProcessManager.any());
final MacOSEngineArtifacts artifacts = MacOSEngineArtifacts(cache, platform: FakePlatform());