Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Roll buildroot to pick up iOS 12 #49542

Merged
merged 6 commits into from
Jan 9, 2024
Merged

Conversation

jmagman
Copy link
Member

@jmagman jmagman commented Jan 4, 2024

flutter/buildroot#804
flutter/buildroot#806
flutter/buildroot#808
flutter/buildroot#809
flutter/buildroot#810

Engine tests were already running on iOS 13.

Part of flutter/flutter#140474

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.

@zanderso
Copy link
Member

zanderso commented Jan 5, 2024

@jason-simmons this PR has the failure that needs the fix to the sed command I mentioned here flutter/buildroot#806 (review)

@jmagman
Copy link
Member Author

jmagman commented Jan 6, 2024

@jason-simmons this roll has sed issues:

Generating GN files in: out/wasm_release
ERROR at //build/toolchain/gcc_toolchain.gni:128:27: Assignment had no effect.
      sed_in_place_flag = "-i"

https://logs.chromium.org/logs/flutter/buildbucket/cr-buildbucket/8759705668090838113/+/u/gn_--web_--runtime-mode_release_--no-goma_--no-lto/stdout

@zanderso
Copy link
Member

zanderso commented Jan 8, 2024

@jmagman I edited this PR to pick up another patch from @jason-simmons and rebased.

@zanderso
Copy link
Member

zanderso commented Jan 8, 2024

Ohh, the change to the sed flag is somehow leaking into the clang-tidy command?

error: unknown argument: '-i' [clang-diagnostic-error]

@jason-simmons
Copy link
Member

Yes - confirmed locally that the compile_commands.json file used by the clang-tidy script will now contain the sed command if it was generated with Goma enabled by default.

Working on a patch that will filter out the sed command when clang-tidy builds Command.tidyArgs.

@jmagman
Copy link
Member Author

jmagman commented Jan 8, 2024

Why aren't these showing up during clang-tidy and not compilation? Filed flutter/flutter#141130

Found compiler error(s).
error: unknown argument: '-i' [clang-diagnostic-error]

Yes - confirmed locally that the compile_commands.json file used by the clang-tidy script will now contain the sed command if it was generated with Goma enabled by default.

Working on a patch that will filter out the sed command when clang-tidy builds Command.tidyArgs.

Is the problem that compile_commands.json contains the sed command, or is it that the -i argument is still unknown?

@jason-simmons
Copy link
Member

This is happening because the engine's clang-tidy wrapper script is parsing compile_commands.json to find the build's compile commands and convert them into clang-tidy commands.

The clang-tidy wrapper is not expecting the sed part of the compile command and is generating an invalid clang-tidy command.

jason-simmons added a commit to jason-simmons/flutter_engine that referenced this pull request Jan 8, 2024
jason-simmons added a commit to jason-simmons/flutter_engine that referenced this pull request Jan 8, 2024
jason-simmons added a commit to jason-simmons/flutter_engine that referenced this pull request Jan 8, 2024
auto-submit bot pushed a commit that referenced this pull request Jan 8, 2024
@jmagman jmagman marked this pull request as ready for review January 8, 2024 23:41
@jmagman jmagman requested a review from zanderso January 9, 2024 01:01
@jmagman jmagman added the autosubmit Merge PR when tree becomes green via auto submit App label Jan 9, 2024
@auto-submit auto-submit bot merged commit b2ca7bd into flutter:main Jan 9, 2024
29 checks passed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 9, 2024
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 9, 2024
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Jan 9, 2024
…141152)

flutter/engine@d134799...820645d

2024-01-09 skia-flutter-autoroll@skia.org Roll Skia from e3af4a11007d to 06404ed554e7 (1 revision) (flutter/engine#49614)
2024-01-09 magder@google.com Roll buildroot to pick up iOS 12 (flutter/engine#49542)
2024-01-09 skia-flutter-autoroll@skia.org Roll Skia from f4626a2e3293 to e3af4a11007d (1 revision) (flutter/engine#49613)

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 join this conversation on GitHub. Already have an account? Sign in to comment
Labels
autosubmit Merge PR when tree becomes green via auto submit App
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants