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

Reverts "macOS: Refactor create_macos_framework.py (#54557)" #54566

Merged
merged 1 commit into from
Aug 15, 2024

Conversation

auto-submit[bot]
Copy link
Contributor

@auto-submit auto-submit bot commented Aug 15, 2024

Reverts: #54557

Initiated by: zanderso

Reason for reverting: Failing on framework tests on the roll https://ci.chromium.org/ui/p/flutter/builders/try/Mac_arm64%20run_debug_test_macos/9841/overview

Original PR Author: cbracken

Reviewed By: {jmagman}

This change reverts the following previous change:
This is a refactoring with no semantic changes.

This refactors the macOS framework creation code to be more readable, and extracts it to sky_utils.py.

While I was pulling this out, also generalised the code to not hardcode FlutterMacOS.framework in case we one day manage to generate the iOS and macOS frameworks with the same name.

This is a reland of #54546 (reverted in #54549), the original was reverted in order to revert #54543 (reverted in #54550), which was reverted because it failed to preserve symlinks while zipping the macOS framework. That patch has been relanded with a fix in #54555. This patch has been rebased to tip-of-tree for attempt two.

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 and the C++, Objective-C, Java style guides.
  • I listed at least one issue that this PR fixes in the description above.
  • I added new tests to check the change I am making or feature I am adding, or the PR is test-exempt. See testing the engine for instructions on writing and running engine tests.
  • I updated/added relevant documentation (doc comments with ///).
  • I signed the CLA.
  • All existing and new tests are passing.

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

@auto-submit auto-submit bot added the revert of Bot Only: Tracking label for bot. Tracks new revert of pull requests. label Aug 15, 2024
@auto-submit auto-submit bot merged commit 971ddd9 into main Aug 15, 2024
7 checks passed
@auto-submit auto-submit bot deleted the revert_7949ab379f56eee7139f03d78b9fb1084548bf6a branch August 15, 2024 05:05
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Aug 15, 2024
…153487)

flutter/engine@76a1c64...971ddd9

2024-08-15 98614782+auto-submit[bot]@users.noreply.github.com Reverts "macOS: Refactor create_macos_framework.py (#54557)" (flutter/engine#54566)
2024-08-15 98614782+auto-submit[bot]@users.noreply.github.com Reverts "[Impeller] migrate blur tests to display list. (#54519)" (flutter/engine#54564)
2024-08-15 jonahwilliams@google.com [Impeller] migrate blur tests to display list. (flutter/engine#54519)
2024-08-14 skia-flutter-autoroll@skia.org Roll Fuchsia Test Scripts from J1EXQ2ozMIQEa6F7H... to -XDS8eBA0Le-zCEfW... (flutter/engine#54561)
2024-08-14 chris@bracken.jp macOS: Refactor create_macos_framework.py (flutter/engine#54557)
2024-08-14 skia-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from MeV5i7xXXFPHF5sBK... to qpfC-GAVZvOwAQU5f... (flutter/engine#54559)

Also rolling transitive DEPS:
  fuchsia/sdk/core/linux-amd64 from MeV5i7xXXFPH to qpfC-GAVZvOw

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC rmistry@google.com,zra@google.com on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
DBowen33 pushed a commit to DBowen33/flutter that referenced this pull request Aug 16, 2024
…lutter#153487)

flutter/engine@76a1c64...971ddd9

2024-08-15 98614782+auto-submit[bot]@users.noreply.github.com Reverts "macOS: Refactor create_macos_framework.py (flutter#54557)" (flutter/engine#54566)
2024-08-15 98614782+auto-submit[bot]@users.noreply.github.com Reverts "[Impeller] migrate blur tests to display list. (flutter#54519)" (flutter/engine#54564)
2024-08-15 jonahwilliams@google.com [Impeller] migrate blur tests to display list. (flutter/engine#54519)
2024-08-14 skia-flutter-autoroll@skia.org Roll Fuchsia Test Scripts from J1EXQ2ozMIQEa6F7H... to -XDS8eBA0Le-zCEfW... (flutter/engine#54561)
2024-08-14 chris@bracken.jp macOS: Refactor create_macos_framework.py (flutter/engine#54557)
2024-08-14 skia-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from MeV5i7xXXFPHF5sBK... to qpfC-GAVZvOwAQU5f... (flutter/engine#54559)

Also rolling transitive DEPS:
  fuchsia/sdk/core/linux-amd64 from MeV5i7xXXFPH to qpfC-GAVZvOw

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC rmistry@google.com,zra@google.com on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Buchimi pushed a commit to Buchimi/flutter that referenced this pull request Sep 2, 2024
…lutter#153487)

flutter/engine@76a1c64...971ddd9

2024-08-15 98614782+auto-submit[bot]@users.noreply.github.com Reverts "macOS: Refactor create_macos_framework.py (flutter#54557)" (flutter/engine#54566)
2024-08-15 98614782+auto-submit[bot]@users.noreply.github.com Reverts "[Impeller] migrate blur tests to display list. (flutter#54519)" (flutter/engine#54564)
2024-08-15 jonahwilliams@google.com [Impeller] migrate blur tests to display list. (flutter/engine#54519)
2024-08-14 skia-flutter-autoroll@skia.org Roll Fuchsia Test Scripts from J1EXQ2ozMIQEa6F7H... to -XDS8eBA0Le-zCEfW... (flutter/engine#54561)
2024-08-14 chris@bracken.jp macOS: Refactor create_macos_framework.py (flutter/engine#54557)
2024-08-14 skia-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from MeV5i7xXXFPHF5sBK... to qpfC-GAVZvOwAQU5f... (flutter/engine#54559)

Also rolling transitive DEPS:
  fuchsia/sdk/core/linux-amd64 from MeV5i7xXXFPH to qpfC-GAVZvOw

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC rmistry@google.com,zra@google.com on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
revert of Bot Only: Tracking label for bot. Tracks new revert of pull requests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants