Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Bump goldctl #47391

Merged
auto-submit merged 1 commit into from
Oct 31, 2023
Merged

Bump goldctl #47391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ targets:
config_name: mac_host_engine
dependencies: >-
[
{"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"}
Copy link
Contributor

@eyebrowsoffire eyebrowsoffire Oct 27, 2023

Choose a reason for hiding this comment

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

Actually this one might not be necessary at all. This task is just the engine_v2 orchestrator task (the parent task that spawns the sub-builds). It seems unlikely that any actual tests will run in the orchestrator that use skia gold.

{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
]
$flutter/osx_sdk : >-
{
Expand Down
68 changes: 34 additions & 34 deletions ci/builders/linux_web_engine.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
},
{
"dependency": "chrome_and_driver",
Expand Down Expand Up @@ -387,7 +387,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
},
{
"dependency": "chrome_and_driver",
Expand Down Expand Up @@ -423,7 +423,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
},
{
"dependency": "chrome_and_driver",
Expand Down Expand Up @@ -459,7 +459,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
},
{
"dependency": "chrome_and_driver",
Expand Down Expand Up @@ -495,7 +495,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
},
{
"dependency": "chrome_and_driver",
Expand Down Expand Up @@ -531,7 +531,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
},
{
"dependency": "chrome_and_driver",
Expand Down Expand Up @@ -567,7 +567,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
},
{
"dependency": "chrome_and_driver",
Expand Down Expand Up @@ -603,7 +603,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
},
{
"dependency": "chrome_and_driver",
Expand Down Expand Up @@ -639,7 +639,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
},
{
"dependency": "firefox",
Expand Down Expand Up @@ -675,7 +675,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
},
{
"dependency": "firefox",
Expand Down Expand Up @@ -711,7 +711,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
},
{
"dependency": "firefox",
Expand Down Expand Up @@ -747,7 +747,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
},
{
"dependency": "firefox",
Expand Down Expand Up @@ -783,7 +783,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
},
{
"dependency": "firefox",
Expand Down Expand Up @@ -819,7 +819,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
},
{
"dependency": "chrome_and_driver",
Expand Down Expand Up @@ -855,7 +855,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
},
{
"dependency": "chrome_and_driver",
Expand Down Expand Up @@ -891,7 +891,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
},
{
"dependency": "chrome_and_driver",
Expand Down Expand Up @@ -927,7 +927,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
},
{
"dependency": "chrome_and_driver",
Expand Down Expand Up @@ -963,7 +963,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
},
{
"dependency": "chrome_and_driver",
Expand Down Expand Up @@ -999,7 +999,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
},
{
"dependency": "chrome_and_driver",
Expand Down Expand Up @@ -1035,7 +1035,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
},
{
"dependency": "chrome_and_driver",
Expand Down Expand Up @@ -1071,7 +1071,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
},
{
"dependency": "chrome_and_driver",
Expand Down Expand Up @@ -1107,7 +1107,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
}
],
"tasks": [
Expand Down Expand Up @@ -1139,7 +1139,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
}
],
"tasks": [
Expand Down Expand Up @@ -1171,7 +1171,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
}
],
"tasks": [
Expand Down Expand Up @@ -1203,7 +1203,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
}
],
"tasks": [
Expand Down Expand Up @@ -1235,7 +1235,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
}
],
"tasks": [
Expand Down Expand Up @@ -1267,7 +1267,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
},
{
"dependency": "chrome_and_driver",
Expand Down Expand Up @@ -1303,7 +1303,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
},
{
"dependency": "chrome_and_driver",
Expand Down Expand Up @@ -1339,7 +1339,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
},
{
"dependency": "chrome_and_driver",
Expand Down Expand Up @@ -1375,7 +1375,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
},
{
"dependency": "chrome_and_driver",
Expand Down Expand Up @@ -1411,7 +1411,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
},
{
"dependency": "chrome_and_driver",
Expand Down Expand Up @@ -1447,7 +1447,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
},
{
"dependency": "chrome_and_driver",
Expand Down Expand Up @@ -1483,7 +1483,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
},
{
"dependency": "chrome_and_driver",
Expand Down Expand Up @@ -1519,7 +1519,7 @@
"test_dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
},
{
"dependency": "chrome_and_driver",
Expand Down
2 changes: 1 addition & 1 deletion ci/builders/mac_host_engine.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
"dependencies": [
{
"dependency": "goldctl",
"version": "git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09"
"version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"
}
],
"gclient_variables": {
Expand Down
2 changes: 1 addition & 1 deletion lib/web_ui/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ After rolling Chrome and/or Firefox, also update the CI dependencies in
[
{"dependency": "chrome_and_driver", "version": "version:107.0"},
{"dependency": "firefox", "version": "version:83.0"},
{"dependency": "goldctl", "version": "git_revision:3a77d0b12c697a840ca0c7705208e8622dc94603"}
Copy link
Contributor

@eyebrowsoffire eyebrowsoffire Oct 27, 2023

Choose a reason for hiding this comment

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

Yeah and this readme is woefully out of date, from before the engine_v2 migration. I should update it.

{"dependency": "goldctl", "version": "git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd"}
]
```

Expand Down
2 changes: 1 addition & 1 deletion lib/web_ui/dev/generate_builder_json.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ Iterable<dynamic> _getTestStepsForPlatform(
'test_dependencies': <dynamic>[
<String, dynamic>{
'dependency': 'goldctl',
'version': 'git_revision:dddc0623e63150cbbafdcb273d4048f329e1dd09',
'version': 'git_revision:720a542f6fe4f92922c3b8f0fdcc4d2ac6bb83cd',
Copy link
Contributor

@yjbanov yjbanov Oct 27, 2023

Choose a reason for hiding this comment

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

@eyebrowsoffire can we get this value from .ci.yaml instead of hard-coding it here?

Copy link
Contributor Author

@Piinks Piinks Oct 27, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Yeah I think it was better when we kept this version in one single source of truth in the recipes. Between here and the ci.yaml in the framework (updated in flutter/flutter#137441), there were more than 7 different version strings. 😕
Tracking all these down feels like it was better when there one place this was updated.

Copy link
Contributor

@eyebrowsoffire eyebrowsoffire Oct 27, 2023

Choose a reason for hiding this comment

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

Answering the specific question, no, there is not a way to specify these from .ci.yaml currently. Only the orchestrator CI step is actually specified in the .ci.yaml file. This generates the builder JSON file that specifies the engine_v2 sub-builds, so we have to specify that here. I do understand the distaste for the deep layering of our CI processes, but it's just the way things are at the moment.

Copy link
Member

@zanderso zanderso Oct 27, 2023

Choose a reason for hiding this comment

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

My recommendation for the engine repo would be to pull the CIPD package with gclient sync by listing it in the DEPS file. Then at least for the engine repo, the hash would be in only one place. The tricky bit would be that the scripts that use goldctl would need to be updated to refer to the destination of the CIPD package in the engine tree.

Copy link
Contributor Author

@Piinks Piinks Oct 31, 2023

Choose a reason for hiding this comment

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

I think that sounds good. I am not at all familiar with the engine implementation of Gold, maybe @mdebbar can advise on changing it to use gclient sync? I'd like to land this for now since it is trying to resolve a high number of flakes we are seeing from the service.

},
if (suite.runConfig.browser == BrowserName.chrome)
<String, dynamic>{
Expand Down