Update outdated runners in the benchmarks folder #91126

gspencergoog · 2021-10-01T23:44:07Z

Description

This PR updates the platform runners in the benchmarks subdir.

I've attempted to replace the entire group with new code as if the project were recreated with flutter create so that they don't become a Frankenstein of minor changes to make it work again, but just plain old generated code that can be replaced and updated in place.

Tests

No tests because we're just updating boilerplate here.

flutter-dashboard · 2021-10-05T21:41:34Z

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact Hixie on the #hackers channel in Chat.

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing.

Hixie · 2021-10-05T21:43:51Z

test-exempt: refactor with no semantic change (applying new boilerplate)

blasten · 2021-10-05T23:44:18Z

dev/benchmarks/complex_layout/android/build.gradle

    repositories {
        google()
        mavenCentral()
    }

    dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0'
+        classpath 'com.android.tools.build:gradle:4.1.0'


I think this was intentionally migrated to Gradle 7.0.0. This change may conflict with #90642

Ahh, OK, I'll revert this. Is someone migrating the template too?

yep. #90642 migrates templates too

Actually, I think I'll wait for #90642 to land, and then update this and the other PR. It's likely to conflict in other ways too, and I don't want make Taha have to merge even more files.

blasten · 2021-10-05T23:49:00Z

dev/benchmarks/complex_layout/android/build.gradle

@@ -2,25 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.

-// This file is auto generated.
-// To update all the build.gradle files in the Flutter repo,
-// See dev/tools/bin/generate_gradle_lockfiles.dart.


nit: this file is auto-generated

blasten · 2021-10-05T23:49:30Z

dev/benchmarks/complex_layout/android/settings.gradle

@@ -2,14 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.

-// This file is auto generated.
-// To update all the settings.gradle files in the Flutter repo,
-// See dev/tools/bin/generate_gradle_lockfiles.dart.


blasten · 2021-10-05T23:54:37Z

Thinking this through, I wonder if we should have a more general purpose script that keeps the boilerplate in sync.
This script was an attempt to auto-generate build.gradle files that have locked dependencies.

Potentially, the new script could run flutter create . in each directory, and then patch certain files on top (if necessary).

gspencergoog · 2021-10-05T23:57:53Z

Thinking this through, I wonder if we should have a more general purpose script that keeps the boilerplate in sync.

I think that's an excellent idea.

gspencergoog · 2021-10-06T00:03:00Z

In doing this, I found there were a few directories that needed to be exempt (there's a test for the outdated embeddings, and there's an android test where it has a custom runner, for instance), but in general I think that should be possible.

My basic methodology was to remove all of the boilerplate directories entirely, and then regenerate using flutter create . with the appropriate platforms and arguments, and then git add the new boilerplate directories.

blasten · 2021-10-06T00:12:13Z

got it. We don't have a well defined pattern for testing older project files, or even showing good error messages in the tool when the current project files are out-dated.

gspencergoog · 2021-10-06T00:35:37Z

Once we have a migration script, we could have a CI test that runs the script and sees if there is any difference, though. That would at least catch the runners that are out of date in the repo when we update the templates.

gspencergoog · 2021-10-06T00:46:23Z

Even if we just ran generate_gradle_lockfiles.dart as part of a CI script, we could catch old embeddings earlier.

gspencergoog · 2021-10-08T01:12:54Z

@blasten OK, I think I've merged this with #90642 now, and I re-ran the dev/tools/bin/generate_gradle_lockfile.dart script after the merge to take care of any inconsistencies in the lockfiles, but I noticed that it was advocating version 4.1.3, whereas the files on master had been updated to 7.0.1. I think I did the right thing by updating it in the script to 7.0.1 and re-running, but I really have no idea. If you could check that I didn't just revert someone else's work, that would be great.

fluttergithubbot · 2021-10-19T01:23:04Z

This pull request is not suitable for automatic merging in its current state.

The status or check suite Linux firebase_android_embedding_v2_smoke_test has failed. Please fix the issues identified (or deflake) before re-applying this label.

This reverts commit 31e3364.

…92106) This reverts commit 31e3364.

This change updates the platform runners in the benchmarks subdir. I've attempted to replace the entire group with new code as if the project were recreated with flutter create so that they don't become a Frankenstein of minor changes to make it work again, but just plain old generated code that can be replaced and updated in place.

…)" (flutter#92106) This reverts commit 31e3364.

)" (flutter#92106)" This reverts commit b412f6f.

…92535)

…1126)" (#92535)" This reverts commit bfe9c59.

…1126)" (#92535)" (#93323) This reverts commit bfe9c59.

)" (flutter#92535)

…utter#91126)" (flutter#92535)" (flutter#93323) This reverts commit bfe9c59.

flutter-dashboard bot added f: integration_test The flutter/packages/integration_test plugin c: contributor-productivity Team-specific productivity, code health, technical debt. tool Affects the "flutter" command-line tool. See also t: labels. labels Oct 1, 2021

google-cla bot added the cla: yes label Oct 1, 2021

gspencergoog force-pushed the update_embeddings_2 branch 2 times, most recently from ab61685 to 4b60e29 Compare October 5, 2021 18:46

gspencergoog changed the title ~~Update outdated embeddings in the benchmarks folder~~ Update outdated runners in the benchmarks folder Oct 5, 2021

gspencergoog marked this pull request as ready for review October 5, 2021 21:41

gspencergoog requested a review from blasten October 5, 2021 21:41

blasten reviewed Oct 5, 2021

View reviewed changes

gspencergoog force-pushed the update_embeddings_2 branch from 4b60e29 to e20feec Compare October 6, 2021 00:44

gspencergoog force-pushed the update_embeddings_2 branch 2 times, most recently from d076fff to 54c8af9 Compare October 8, 2021 01:09

gspencergoog added 2 commits October 18, 2021 09:49

Update outdated embeddings in the benchmarks folder

f055129

Regenerate lockfiles

71c668f

gspencergoog force-pushed the update_embeddings_2 branch from 54c8af9 to 71c668f Compare October 18, 2021 17:25

blasten approved these changes Oct 18, 2021

View reviewed changes

gspencergoog added the waiting for tree to go green label Oct 19, 2021

fluttergithubbot removed the waiting for tree to go green label Oct 19, 2021

gspencergoog merged commit 31e3364 into flutter:master Oct 19, 2021

gspencergoog deleted the update_embeddings_2 branch October 19, 2021 15:27

zanderso added a commit that referenced this pull request Oct 19, 2021

Revert "Update outdated runners in the benchmarks folder (#91126)"

6c7a8e1

This reverts commit 31e3364.

zanderso mentioned this pull request Oct 19, 2021

Revert "Update outdated runners in the benchmarks folder" #92106

Merged

zanderso added a commit that referenced this pull request Oct 19, 2021

Revert "Update outdated runners in the benchmarks folder (#91126)" (#…

b412f6f

…92106) This reverts commit 31e3364.

clocksmith pushed a commit to clocksmith/flutter that referenced this pull request Oct 29, 2021

Revert "Update outdated runners in the benchmarks folder (flutter#91126…

cadb726

…)" (flutter#92106) This reverts commit 31e3364.

gspencergoog added a commit to gspencergoog/flutter that referenced this pull request Nov 8, 2021

Reland: "Update outdated runners in the benchmarks folder (flutter#91126

e1471e2

)" (flutter#92106)" This reverts commit b412f6f.

fluttergithubbot pushed a commit that referenced this pull request Nov 9, 2021

Reland: "Update outdated runners in the benchmarks folder (#91126)" (#…

bfe9c59

…92535)

zanderso added a commit that referenced this pull request Nov 9, 2021

Revert "Reland: "Update outdated runners in the benchmarks folder (#9…

ddc7906

…1126)" (#92535)" This reverts commit bfe9c59.

zanderso added a commit that referenced this pull request Nov 9, 2021

Revert "Reland: "Update outdated runners in the benchmarks folder (#9…

366648a

…1126)" (#92535)" (#93323) This reverts commit bfe9c59.

WizzXu pushed a commit to WizzXu/flutter that referenced this pull request Nov 19, 2021

Reland: "Update outdated runners in the benchmarks folder (flutter#91126

70c9704

)" (flutter#92535)

WizzXu pushed a commit to WizzXu/flutter that referenced this pull request Nov 19, 2021

Revert "Reland: "Update outdated runners in the benchmarks folder (fl…

b4c50e7

…utter#91126)" (flutter#92535)" (flutter#93323) This reverts commit bfe9c59.

Update outdated runners in the benchmarks folder #91126

Update outdated runners in the benchmarks folder #91126

Uh oh!

Conversation

gspencergoog commented Oct 1, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Tests

Uh oh!

flutter-dashboard bot commented Oct 5, 2021

Uh oh!

Hixie commented Oct 5, 2021

Uh oh!

blasten Oct 5, 2021

Choose a reason for hiding this comment

Uh oh!

gspencergoog Oct 5, 2021

Choose a reason for hiding this comment

Uh oh!

blasten Oct 5, 2021

Choose a reason for hiding this comment

Uh oh!

gspencergoog Oct 6, 2021

Choose a reason for hiding this comment

Uh oh!

blasten Oct 5, 2021

Choose a reason for hiding this comment

Uh oh!

blasten Oct 5, 2021

Choose a reason for hiding this comment

Uh oh!

blasten commented Oct 5, 2021

Uh oh!

gspencergoog commented Oct 5, 2021

Uh oh!

gspencergoog commented Oct 6, 2021

Uh oh!

blasten commented Oct 6, 2021

Uh oh!

gspencergoog commented Oct 6, 2021

Uh oh!

gspencergoog commented Oct 6, 2021

Uh oh!

gspencergoog commented Oct 8, 2021

Uh oh!

fluttergithubbot commented Oct 19, 2021

Uh oh!

Uh oh!

gspencergoog commented Oct 1, 2021 •

edited

Loading