Skip to content

Replace rsync when unzipping artifacts on a Mac#126703

Merged
auto-submit[bot] merged 3 commits intoflutter:masterfrom
vashworth:replace_unzip_rsync
May 16, 2023
Merged

Replace rsync when unzipping artifacts on a Mac#126703
auto-submit[bot] merged 3 commits intoflutter:masterfrom
vashworth:replace_unzip_rsync

Conversation

@vashworth
Copy link
Contributor

@vashworth vashworth commented May 12, 2023 •
edited
Loading

Instead of using rsync, which has caused errors in the past (#99785), delete the file/directory/link prior to moving it.

Hopefully should let us stop double zipping the FlutterMacOS.framework in the engine: https://github.com/flutter/engine/pull/41306/files

Part of #126016.

Pre-launch Checklist

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I read the Tree Hygiene wiki page, which explains my responsibilities.
  • I read and followed the Flutter Style Guide, including Features we expect every widget to implement.
  • I signed the CLA.
  • I listed at least one issue that this PR fixes in the description above.
  • I updated/added relevant documentation (doc comments with ///).
  • I added new tests to check the change I am making, or this PR is test-exempt.
  • All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

@flutter-dashboard flutter-dashboard bot added the tool Affects the "flutter" command-line tool. See also t: labels. label May 12, 2023
@christopherfujino
Copy link
Contributor

christopherfujino commented May 15, 2023

Sorry I didn't finish reviewing, will get back to this this afternoon.

christopherfujino
christopherfujino approved these changes May 15, 2023
View reviewed changes
Copy link
Contributor

@christopherfujino christopherfujino left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

packages/flutter_tools/lib/src/base/os.dart Outdated
Comment on lines +427 to +429
/// Unzip into a temporary directory. For every file/directory/link in the
/// unzipped file, delete the corresponding entity in the [targetDirectory]
/// before moving from the temporary directory to the [targetDirectory].
Copy link
Contributor

@christopherfujino christopherfujino May 13, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
/// Unzip into a temporary directory. For every file/directory/link in the
/// unzipped file, delete the corresponding entity in the [targetDirectory]
/// before moving from the temporary directory to the [targetDirectory].
/// Unzip into a temporary directory.
///
/// For every file/directory/link in the
/// unzipped file, delete the corresponding entity in the [targetDirectory]
/// before moving from the temporary directory to the [targetDirectory].

@vashworth vashworth added the autosubmit Merge PR when tree becomes green via auto submit App label May 16, 2023
@auto-submit auto-submit bot merged commit 2b3cd7f into flutter:master May 16, 2023
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request May 16, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 16, 2023
@engine-flutter-autoroll
2b3cd7f Replace rsync when unzipping artifacts on a Mac (flutter/flut…
e2ef5c0 
…ter#126703)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request May 16, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 16, 2023
@engine-flutter-autoroll
2b3cd7f Replace rsync when unzipping artifacts on a Mac (flutter/flut…
084e6af 
…ter#126703)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request May 16, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 16, 2023
@engine-flutter-autoroll
2b3cd7f Replace rsync when unzipping artifacts on a Mac (flutter/flut…
374a7ab 
…ter#126703)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request May 16, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 16, 2023
@engine-flutter-autoroll
2b3cd7f Replace rsync when unzipping artifacts on a Mac (flutter/flut…
1dd7044 
…ter#126703)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request May 16, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 16, 2023
@engine-flutter-autoroll
2b3cd7f Replace rsync when unzipping artifacts on a Mac (flutter/flut…
560862f 
…ter#126703)
This was referenced May 23, 2023
Closed
Closed
vashworth added a commit to vashworth/flutter that referenced this pull request May 23, 2023
@vashworth
Revert "Replace rsync when unzipping artifacts on a Mac (flutter#126703…
8501b4f 
…)"

This reverts commit 2b3cd7f.
CaseyHillers pushed a commit to CaseyHillers/flutter that referenced this pull request May 24, 2023
@vashworth
Replace rsync when unzipping artifacts on a Mac (flutter#126703)
ce841df 
Instead of using rsync, which has caused errors in the past (flutter#99785), delete the file/directory/link prior to moving it.

Hopefully should let us stop double zipping the FlutterMacOS.framework in the engine: https://github.com/flutter/engine/pull/41306/files

Part of flutter#126016.
auto-submit bot pushed a commit that referenced this pull request May 24, 2023
@vashworth
Revert "Replace rsync when unzipping artifacts on a Mac (#126703)" (#…
555326b 
…127430)

This reverts commit 2b3cd7f.

Fixes #127281.
This was referenced May 25, 2023
Merged
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 16, 2023
@engine-flutter-autoroll
2b3cd7f Replace rsync when unzipping artifacts on a Mac (flutter/flut…
cd897e9 
…ter#126703)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 17, 2023
@engine-flutter-autoroll
2b3cd7f Replace rsync when unzipping artifacts on a Mac (flutter/flut…
9d56823 
…ter#126703)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 17, 2023
@engine-flutter-autoroll
2b3cd7f Replace rsync when unzipping artifacts on a Mac (flutter/flut…
58accb4 
…ter#126703)
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Aug 17, 2023
@engine-flutter-autoroll
2b3cd7f Replace rsync when unzipping artifacts on a Mac (flutter/flut…
30f72ac 
…ter#126703)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@christopherfujino christopherfujino christopherfujino approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

autosubmit Merge PR when tree becomes green via auto submit App tool Affects the "flutter" command-line tool. See also t: labels.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@vashworth @christopherfujino