firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[flutter_tools] print out the unzipping method used by update_dart_sdk.ps1 (#133364)

Browse Source 
in case there are future issues with unzipping the dart sdk, such as https://github.com/flutter/flutter/issues/132592, we should log out what tool we are using to try to extract the archive.
This commit is contained in:
Christopher Fujino 2023-08-31 14:06:47 -07:00 committed by GitHub
parent acdcbae78a
commit 1519553bed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bin/internal/update_dart_sdk.ps1
View File

@ -83,18 +83,21 @@ Catch {
$ProgressPreference = $OriginalProgressPreference $ProgressPreference = $OriginalProgressPreference
} }
Write-Host "Expanding downloaded archive..."
If (Get-Command 7z -errorAction SilentlyContinue) { If (Get-Command 7z -errorAction SilentlyContinue) {
Write-Host "Expanding downloaded archive with 7z..."
# The built-in unzippers are painfully slow. Use 7-Zip, if available. # The built-in unzippers are painfully slow. Use 7-Zip, if available.
& 7z x $dartSdkZip "-o$cachePath" -bd | Out-Null & 7z x $dartSdkZip "-o$cachePath" -bd | Out-Null
} ElseIf (Get-Command 7za -errorAction SilentlyContinue) { } ElseIf (Get-Command 7za -errorAction SilentlyContinue) {
Write-Host "Expanding downloaded archive with 7za..."
# Use 7-Zip's standalone version 7za.exe, if available. # Use 7-Zip's standalone version 7za.exe, if available.
& 7za x $dartSdkZip "-o$cachePath" -bd | Out-Null & 7za x $dartSdkZip "-o$cachePath" -bd | Out-Null
} ElseIf (Get-Command Microsoft.PowerShell.Archive\Expand-Archive -errorAction SilentlyContinue) { } ElseIf (Get-Command Microsoft.PowerShell.Archive\Expand-Archive -errorAction SilentlyContinue) {
Write-Host "Expanding downloaded archive with PowerShell..."
# Use PowerShell's built-in unzipper, if available (requires PowerShell 5+). # Use PowerShell's built-in unzipper, if available (requires PowerShell 5+).
$global:ProgressPreference='SilentlyContinue' $global:ProgressPreference='SilentlyContinue'
Microsoft.PowerShell.Archive\Expand-Archive $dartSdkZip -DestinationPath $cachePath Microsoft.PowerShell.Archive\Expand-Archive $dartSdkZip -DestinationPath $cachePath
} Else { } Else {
Write-Host "Expanding downloaded archive with Windows..."
# As last resort: fall back to the Windows GUI. # As last resort: fall back to the Windows GUI.
$shell = New-Object -com shell.application $shell = New-Object -com shell.application
$zip = $shell.NameSpace($dartSdkZip) $zip = $shell.NameSpace($dartSdkZip)

3
packages/flutter_tools/test/integration.shard/batch_entrypoint_test.dart
View File

@ -49,7 +49,8 @@ Future<void> main() async {
// See: https://github.com/flutter/flutter/issues/132592 // See: https://github.com/flutter/flutter/issues/132592
expect(dartSdkStamp.existsSync(), true); expect(dartSdkStamp.existsSync(), true);
expect(output, contains('Downloading Dart SDK from Flutter engine ...')); expect(output, contains('Downloading Dart SDK from Flutter engine ...'));
expect(output, contains('Expanding downloaded archive...')); // Do not assert on the exact unzipping method, as this could change on CI
expect(output, contains(RegExp(r'Expanding downloaded archive with (.*)...')));
expect(output, isNot(contains('Use the -Force parameter' /* Luke */))); expect(output, isNot(contains('Use the -Force parameter' /* Luke */)));
}, },
skip: !platform.isWindows); // [intended] Only Windows uses the batch entrypoint skip: !platform.isWindows); // [intended] Only Windows uses the batch entrypoint