Skip to content

Conversation

@jmagman
Copy link
Member

@jmagman jmagman commented Apr 8, 2022

In anticipation of the rename of these directories in #97342 in the engine, update these framework tests to handle either the directory Flutter.xcframework/ios-arm64_armv7 or Flutter.xcframework/ios-arm64 depending on which one exists. This will allow the engine roll that introduces the directory name change to pass tests without framework changes.

Also update a few comments to reference ios-arm64 instead of ios-arm64_armv7.

See #85051 and #85642 for similar work when ios-x86_64-simulator became ios-arm64_x86_64-simulator.

Does not handle the codesigning script, to be addressed in a different PR (see also #85265)

'artifacts/engine/ios-profile/Flutter.xcframework/ios-arm64_armv7/Flutter.framework/Flutter',

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.

@jmagman jmagman added a: tests "flutter test", flutter_test, or one of our tests tool Affects the "flutter" command-line tool. See also t: labels. labels Apr 8, 2022
@jmagman jmagman self-assigned this Apr 8, 2022
@flutter-dashboard flutter-dashboard bot added the c: contributor-productivity Team-specific productivity, code health, technical debt. label Apr 8, 2022
continue;
}
// ios-x86_64-simulator, ios-arm64_x86_64-simulator, ios-armv7_arm64 (Xcode 11), or ios-arm64_armv7 (Xcode 12).
// ios-x86_64-simulator, ios-arm64_x86_64-simulator, or ios-arm64.
Copy link
Contributor

Choose a reason for hiding this comment

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

From looking at the code, it seems like _getIosArtifactPath() will automagically generate the correct path?

Copy link
Member Author

Choose a reason for hiding this comment

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

Not sure what you mean, _getIosArtifactPath calls this method _getIosEngineArtifactPath
Used like this:

final String basePath = environment.artifacts.getArtifactPath(
Artifact.flutterFramework,
platform: TargetPlatform.ios,
mode: buildMode,
environmentType: environmentType,
);

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

a: tests "flutter test", flutter_test, or one of our tests c: contributor-productivity Team-specific productivity, code health, technical debt. tool Affects the "flutter" command-line tool. See also t: labels.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants