Skip to content

Commit

Permalink
Move linux-x64-flutter-gtk.zip to linux-x64-debug location. (#120658)
Browse files Browse the repository at this point in the history
* Move linux-x64-flutter-gtk.zip to linux-x64-debug location.

linux-x64-flutter-gtk.zip is being uploaded twice to linux-x64-debug
and linux-x64 as part of making a soft transition to use linux-x64-debug
location. This PR starts using the copy inside linux-x64-debug to later
remove the duplicated upload.

* Also move arm64.

* Do not override output dir.
  • Loading branch information
godofredoc authored Feb 15, 2023
1 parent fd2fd94 commit 9d94a51
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion packages/flutter_tools/lib/src/flutter_cache.dart
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ class LinuxEngineArtifacts extends EngineCachedArtifact {
if (_platform.isLinux || ignorePlatformFiltering) {
final String arch = cache.getHostPlatformArchName();
return <List<String>>[
<String>['linux-$arch', 'linux-$arch/linux-$arch-flutter-gtk.zip'],
<String>['linux-$arch', 'linux-$arch-debug/linux-$arch-flutter-gtk.zip'],
<String>['linux-$arch-profile', 'linux-$arch-profile/linux-$arch-flutter-gtk.zip'],
<String>['linux-$arch-release', 'linux-$arch-release/linux-$arch-flutter-gtk.zip'],
];
Expand Down
4 changes: 2 additions & 2 deletions packages/flutter_tools/test/general.shard/cache_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@ void main() {
);

expect(artifacts.getBinaryDirs(), <List<String>>[
<String>['linux-x64', 'linux-x64/linux-x64-flutter-gtk.zip'],
<String>['linux-x64', 'linux-x64-debug/linux-x64-flutter-gtk.zip'],
<String>['linux-x64-profile', 'linux-x64-profile/linux-x64-flutter-gtk.zip'],
<String>['linux-x64-release', 'linux-x64-release/linux-x64-flutter-gtk.zip'],
]);
Expand All @@ -684,7 +684,7 @@ void main() {
);

expect(artifacts.getBinaryDirs(), <List<String>>[
<String>['linux-arm64', 'linux-arm64/linux-arm64-flutter-gtk.zip'],
<String>['linux-arm64', 'linux-arm64-debug/linux-arm64-flutter-gtk.zip'],
<String>['linux-arm64-profile', 'linux-arm64-profile/linux-arm64-flutter-gtk.zip'],
<String>['linux-arm64-release', 'linux-arm64-release/linux-arm64-flutter-gtk.zip'],
]);
Expand Down

0 comments on commit 9d94a51

Please sign in to comment.