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.

Sign up for GitHub

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

Jump to bottom

Fix flutter CI with re-internalized snippets tool #3776

Merged
merged 1 commit into from
May 28, 2024
Merged

Fix flutter CI with re-internalized snippets tool #3776

merged 1 commit into from
May 28, 2024

Conversation

srawlins
Copy link
Member

Fixes #3773

This recent problem was introduced when the snippets tool was brought back in-house in the flutter repo. We emulate the docs.sh script in this package. We just had to update some logic to mirror itsjustkevin/flutter@9ced09e. All related to flutter/flutter#144408, the root issue.

  • I’ve reviewed the contributor guide and applied the relevant portions to this PR.
Contribution guidelines:

Note that many Dart repos have a weekly cadence for reviewing PRs - please allow for some latency before initial review feedback.

@srawlins
Copy link
Member Author

CC @dart-lang/analyzer-team This is ready for review.

kallentu
kallentu approved these changes May 28, 2024
View reviewed changes
Copy link
Member

@kallentu kallentu left a comment

Choose a reason for hiding this comment

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

Feel free to also get someone else on the analyzer team to review, but this looks fine to me.

@srawlins srawlins merged commit ed97585 into dart-lang:main May 28, 2024
9 checks passed
@srawlins srawlins deleted the fix-flutter branch May 28, 2024 20:51
copybara-service bot pushed a commit to dart-lang/sdk that referenced this pull request May 29, 2024
@devoncarew
[deps] rev args, async, benchmark_harness, boolean_selector, collecti…
9c5085e 
…on, dartdoc, markdown, shelf, web, web_socket_channel, webdev

Revisions updated by `dart tools/rev_sdk_deps.dart`.

args (https://github.com/dart-lang/args/compare/cf90551..b3608bd):
  b3608bd  2024-05-28  Kevin Moore  bump lints dep and fix (dart-lang/args#275)

async (https://github.com/dart-lang/async/compare/77a25d7..f933ddf):
  f933ddf  2024-05-28  Kevin Moore  bump lints dep and fix (dart-lang/async#275)

benchmark_harness (https://github.com/dart-lang/benchmark_harness/compare/accc755..6fa42b0):
  6fa42b0  2024-05-28  Kevin Moore  bump lints dep and fix (dart-lang/benchmark_harness#106)

boolean_selector (https://github.com/dart-lang/boolean_selector/compare/2cbd4a6..84467e5):
  84467e5  2024-05-28  Kevin Moore  bump lints dep and fix (dart-lang/boolean_selector#61)

collection (https://github.com/dart-lang/collection/compare/4718398..fe2e800):
  fe2e800  2024-05-28  Kevin Moore  bump lints dep and fix (dart-lang/collection#344)

dartdoc (https://github.com/dart-lang/dartdoc/compare/1e1a004..ed97585):
  ed975850  2024-05-28  Sam Rawlins  Fix flutter CI with re-internalized snippets tool (dart-lang/dartdoc#3776)

markdown (https://github.com/dart-lang/markdown/compare/340c76f..c1013dc):
  c1013dc  2024-05-28  Kevin Moore  update lints dependency (dart-lang/markdown#613)
  7a3b8d6  2024-05-28  Sam Rawlins  Bump to 7.2.3 (dart-lang/markdown#612)

shelf (https://github.com/dart-lang/shelf/compare/d9f82bf..338962c):
  338962c  2024-05-28  Kevin Moore  update lints dependency (dart-lang/shelf#433)

web (https://github.com/dart-lang/web/compare/d776645..f6f778b):
  f6f778b  2024-05-28  Kenzie Davisson  Expose `onUnload` event stream and `ElementStream` as a public class (dart-lang/web#246)
  e1d5148  2024-05-23  Kevin Moore  Update MDN source and doc comments (dart-lang/web#244)
  53862f1  2024-05-22  Kevin Moore  update lints dependency (dart-lang/web#243)
  7604578  2024-05-21  Srujan Gaddam  Only emit APIs that are standards track and not experimental (dart-lang/web#239)

web_socket_channel (https://github.com/dart-lang/web_socket_channel/compare/45b8ce9..afd1e3c):
  afd1e3c  2024-05-23  Brian Quinlan  Remove `--fatal-infos` from `dart pub downgrade` analysis (dart-lang/web_socket_channel#367)
  cb20b71  2024-05-23  Sarah Zakarias  Add `topics` to `pubspec.yaml` (dart-lang/web_socket_channel#362)
  8514229  2024-05-22  Kevin Moore  Bump and fix lints (dart-lang/web_socket_channel#366)

webdev (https://github.com/dart-lang/webdev/compare/fc32eb6..1bed26a):
  1bed26ab  2024-05-28  Elliott Brooks  Add a reload handler along with a restart handler (dart-lang/webdev#2439)
  15028c4f  2024-05-24  Elliott Brooks  Register a restart handler directly over the VM service connection (dart-lang/webdev#2437)

Change-Id: I4e80ae77b6e74b9cd0b5524b1ba66e0f3de0a14e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/368445
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
Auto-Submit: Devon Carew <devoncarew@google.com>
copybara-service bot pushed a commit to dart-lang/sdk that referenced this pull request May 30, 2024
@iinozemtsev
Revert "[deps] rev args, async, benchmark_harness, boolean_selector, …
be24c79 
…collection, dartdoc, markdown, shelf, web, web_socket_channel, webdev"

This reverts commit 9c5085e.

Reason for revert: b/343654390

Original change's description:
> [deps] rev args, async, benchmark_harness, boolean_selector, collection, dartdoc, markdown, shelf, web, web_socket_channel, webdev
>
> Revisions updated by `dart tools/rev_sdk_deps.dart`.
>
> args (https://github.com/dart-lang/args/compare/cf90551..b3608bd):
>   b3608bd  2024-05-28  Kevin Moore  bump lints dep and fix (dart-lang/args#275)
>
> async (https://github.com/dart-lang/async/compare/77a25d7..f933ddf):
>   f933ddf  2024-05-28  Kevin Moore  bump lints dep and fix (dart-lang/async#275)
>
> benchmark_harness (https://github.com/dart-lang/benchmark_harness/compare/accc755..6fa42b0):
>   6fa42b0  2024-05-28  Kevin Moore  bump lints dep and fix (dart-lang/benchmark_harness#106)
>
> boolean_selector (https://github.com/dart-lang/boolean_selector/compare/2cbd4a6..84467e5):
>   84467e5  2024-05-28  Kevin Moore  bump lints dep and fix (dart-lang/boolean_selector#61)
>
> collection (https://github.com/dart-lang/collection/compare/4718398..fe2e800):
>   fe2e800  2024-05-28  Kevin Moore  bump lints dep and fix (dart-lang/collection#344)
>
> dartdoc (https://github.com/dart-lang/dartdoc/compare/1e1a004..ed97585):
>   ed975850  2024-05-28  Sam Rawlins  Fix flutter CI with re-internalized snippets tool (dart-lang/dartdoc#3776)
>
> markdown (https://github.com/dart-lang/markdown/compare/340c76f..c1013dc):
>   c1013dc  2024-05-28  Kevin Moore  update lints dependency (dart-lang/markdown#613)
>   7a3b8d6  2024-05-28  Sam Rawlins  Bump to 7.2.3 (dart-lang/markdown#612)
>
> shelf (https://github.com/dart-lang/shelf/compare/d9f82bf..338962c):
>   338962c  2024-05-28  Kevin Moore  update lints dependency (dart-lang/shelf#433)
>
> web (https://github.com/dart-lang/web/compare/d776645..f6f778b):
>   f6f778b  2024-05-28  Kenzie Davisson  Expose `onUnload` event stream and `ElementStream` as a public class (dart-lang/web#246)
>   e1d5148  2024-05-23  Kevin Moore  Update MDN source and doc comments (dart-lang/web#244)
>   53862f1  2024-05-22  Kevin Moore  update lints dependency (dart-lang/web#243)
>   7604578  2024-05-21  Srujan Gaddam  Only emit APIs that are standards track and not experimental (dart-lang/web#239)
>
> web_socket_channel (https://github.com/dart-lang/web_socket_channel/compare/45b8ce9..afd1e3c):
>   afd1e3c  2024-05-23  Brian Quinlan  Remove `--fatal-infos` from `dart pub downgrade` analysis (dart-lang/web_socket_channel#367)
>   cb20b71  2024-05-23  Sarah Zakarias  Add `topics` to `pubspec.yaml` (dart-lang/web_socket_channel#362)
>   8514229  2024-05-22  Kevin Moore  Bump and fix lints (dart-lang/web_socket_channel#366)
>
> webdev (https://github.com/dart-lang/webdev/compare/fc32eb6..1bed26a):
>   1bed26ab  2024-05-28  Elliott Brooks  Add a reload handler along with a restart handler (dart-lang/webdev#2439)
>   15028c4f  2024-05-24  Elliott Brooks  Register a restart handler directly over the VM service connection (dart-lang/webdev#2437)
>
> Change-Id: I4e80ae77b6e74b9cd0b5524b1ba66e0f3de0a14e
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/368445
> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
> Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
> Auto-Submit: Devon Carew <devoncarew@google.com>

Change-Id: Ief02507626fe2ef4e8a92e20872a0fec37ae3b71
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/368800
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Devon Carew <devoncarew@google.com>
Commit-Queue: Devon Carew <devoncarew@google.com>
Auto-Submit: Ivan Inozemtsev <iinozemtsev@google.com>
copybara-service bot pushed a commit to dart-lang/sdk that referenced this pull request May 30, 2024
@devoncarew
[deps] rev args, async, benchmark_harness, boolean_selector, collecti…
25d693c 
…on, dartdoc, logging, markdown, shelf, yaml_edit

Revisions updated by `dart tools/rev_sdk_deps.dart`.

args (https://github.com/dart-lang/args/compare/cf90551..b3608bd):
  b3608bd  2024-05-28  Kevin Moore  bump lints dep and fix (dart-lang/args#275)

async (https://github.com/dart-lang/async/compare/77a25d7..f933ddf):
  f933ddf  2024-05-28  Kevin Moore  bump lints dep and fix (dart-lang/async#275)

benchmark_harness (https://github.com/dart-lang/benchmark_harness/compare/accc755..6fa42b0):
  6fa42b0  2024-05-28  Kevin Moore  bump lints dep and fix (dart-lang/benchmark_harness#106)

boolean_selector (https://github.com/dart-lang/boolean_selector/compare/2cbd4a6..84467e5):
  84467e5  2024-05-28  Kevin Moore  bump lints dep and fix (dart-lang/boolean_selector#61)

collection (https://github.com/dart-lang/collection/compare/4718398..fe2e800):
  fe2e800  2024-05-28  Kevin Moore  bump lints dep and fix (dart-lang/collection#344)

dartdoc (https://github.com/dart-lang/dartdoc/compare/1e1a004..ed97585):
  ed975850  2024-05-28  Sam Rawlins  Fix flutter CI with re-internalized snippets tool (dart-lang/dartdoc#3776)

logging (https://github.com/dart-lang/logging/compare/49d89b1..7f722dc):
  7f722dc  2024-05-30  Jonas Finnemann Jensen  Add `topics` to `pubspec.yaml` (dart-lang/logging#164)

markdown (https://github.com/dart-lang/markdown/compare/340c76f..c1013dc):
  c1013dc  2024-05-28  Kevin Moore  update lints dependency (dart-lang/markdown#613)
  7a3b8d6  2024-05-28  Sam Rawlins  Bump to 7.2.3 (dart-lang/markdown#612)

shelf (https://github.com/dart-lang/shelf/compare/d9f82bf..338962c):
  338962c  2024-05-28  Kevin Moore  update lints dependency (dart-lang/shelf#433)

yaml_edit (https://github.com/dart-lang/yaml_edit/compare/3191934..963e7a3):
  963e7a3  2024-05-30  Jonas Finnemann Jensen  Update CHANGELOG.md (dart-lang/yaml_edit#82)
  8fdc96d  2024-05-30  Jonas Finnemann Jensen  Better logging in random_test.dart, and less overall noise from warnings (dart-lang/yaml_edit#81)

Change-Id: I8648cd3c740fbe8ad6a658ae5ed2b5be5c01e2ec
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/368822
Commit-Queue: Devon Carew <devoncarew@google.com>
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
srawlins added a commit to srawlins/dartdoc that referenced this pull request Jun 27, 2024
@srawlins
Fix flutter CI with re-internalized snippets tool (dart-lang#3776)
8be17e1
srawlins added a commit that referenced this pull request Jun 27, 2024
@srawlins @scheglov
Cherry-pick #3784 into an 8.0.9+1 release (#3800)
fb40d2b 
4 cherry-picks + a version bump:

1. cherry-pick 8be17e1

    Fix flutter CI with re-internalized snippets tool (#3776)

2. cherry-pick ae1f184

    Use package:analyzer/source/source.dart (#3780)

3. cherry-pick db3a0ec

    Restrict validation of runtime renderer files to a single, target version of (#3778)
    the analyzer package.

4. cherry-pick 36db497

    Fix referencing an aliased type parameter. (#3784)

    What is an aliased type parameter? Good question! `typedef TD<T> = T;` is such
    an alias. The fix is pretty simple, we just weren't previously handling this
    case, or being safe.

5. Bump to 8.0.9+1

---------

Co-authored-by: Konstantin Scheglov <scheglov@google.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kallentu kallentu kallentu approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Flutter bot failing with snippets issue
2 participants
@srawlins @kallentu