Skip to content

Conversation

@gaaclarke
Copy link
Member

@gaaclarke gaaclarke commented Apr 15, 2024

issue: flutter/flutter#146078

This starts running skia gold bot checks on release branches for the engine. This works for the engine because our infrastructure forks all gold tests when a release branch is created.

See also:

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 the Flutter Style Guide recently, and have followed its advice.
  • 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.

@gaaclarke gaaclarke requested a review from Piinks as a code owner April 15, 2024 20:22
@gaaclarke gaaclarke requested a review from matanlurey April 15, 2024 20:22
@gaaclarke gaaclarke changed the title Added skia gold to engine release branches. Adds skia gold to engine release branches. Apr 15, 2024
Copy link
Contributor

@Piinks Piinks left a comment

Choose a reason for hiding this comment

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

Looks like CI failure is just the autoformatter check.

final String defaultBranch = Config.defaultBranch(slug);
if (pr.base!.ref != defaultBranch) {
log.fine('This change is not staged to land on $defaultBranch, skipping.');
if (!Config.doesSkiaGoldRunOnBranch(slug, pr.base!.ref)) {
Copy link
Contributor

Choose a reason for hiding this comment

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

When someone is working on a release branch, and the golden test fails, blocking a change from landing, how do they resolve it?

And has this been communicated to the team so folks know what to do?

Copy link
Member Author

Choose a reason for hiding this comment

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

When someone is working on a release branch, and the golden test fails, blocking a change from landing, how do they resolve it?

If a cherry-pick on a release branch breaks a golden test, fixing that would depend on why it was broken. It could mean:

  1. An intermediate cherry-pick is missing and needs to also be merged in
  2. It's an integration problem where a fix would have to be devised:
    1. decide not to cherry-pick
    2. author a PR for the release branch
    3. author a PR on the main branch and cherry-pick on the release branch

And has this been communicated to the team so folks know what to do?

Yep, there was design doc that was worked on with the infra team: go/flutter-engine-goldens-workflow, there is also the documentation I linked in the PR description. The linked issue will be the basis for more concrete instructions once we've connected all the dots.

Copy link
Contributor

Choose a reason for hiding this comment

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

SGTM! Thanks for the references. If anyone comes my way I'll direct them there!

@gaaclarke
Copy link
Member Author

I'm not sure how to resolve this. CI is complaining because googleapis is not up to date (13.1.0), but the latest gcloud depends on googleapis less than 13.0.0.

Copy link
Contributor

@Piinks Piinks left a comment

Choose a reason for hiding this comment

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

LGTM

cc @keyonghan may know how to resolve the googleapis issue.

final String defaultBranch = Config.defaultBranch(slug);
if (pr.base!.ref != defaultBranch) {
log.fine('This change is not staged to land on $defaultBranch, skipping.');
if (!Config.doesSkiaGoldRunOnBranch(slug, pr.base!.ref)) {
Copy link
Contributor

Choose a reason for hiding this comment

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

SGTM! Thanks for the references. If anyone comes my way I'll direct them there!

@keyonghan
Copy link
Contributor

Seems latest push failed with format error. To unblock: cocoon is using line-length 120: https://github.com/flutter/cocoon/blob/main/format.sh#L8

@gaaclarke gaaclarke added the autosubmit Merge PR when tree becomes green via auto submit App. label Apr 15, 2024
@auto-submit auto-submit bot merged commit 9203992 into flutter:main Apr 15, 2024
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