-
Notifications
You must be signed in to change notification settings - Fork 6k
fixing cirrus flag issue #20068
fixing cirrus flag issue #20068
Conversation
This pull request was opened from and to a release candidate branch. This should only be done as part of the official Flutter release process. If you are attempting to make a regular contribution to the Flutter project, please close this PR and follow the instructions at Tree Hygiene for detailed instructions on contributing to Flutter. Reviewers: Use caution before merging pull requests to release branches. Ensure the proper procedure has been followed. |
Since master is risky, I sent the fix directly to the release branch @pcsosinski @christopherfujino |
tools/clone_flutter.sh
Outdated
# During the commit tests the base branch value is empty, instead | ||
# `CIRRUS_BRANCH` has the correct branch name. | ||
ENGINE_BRANCH_NAME="$CIRRUS_BASE_BRANCH" | ||
if [[ -z "$CIRRUS_BASE_BRANCH" ]] then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is this the only way to determine we're running post submit?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I only saw two flags in Cirrus. @christopherfujino do you know any other way of determining it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is the only way I know of.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not sure his github handle, so i pinged Fedor in the discord chat
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if [[ -z "$CIRRUS_BASE_BRANCH" ]] then | |
if [[ -z "$CIRRUS_BASE_BRANCH" ]]; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done. thanks!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Not sure if merging on release or master is better so I also have this one: #20071 |
@christopherfujino any thoughts on these two pre submit failures? |
the
and linux web engine also looks legit:
|
I made a suggestion on the PR to fix the Linux web engine failure. |
I don't think it reflects the state on the branch (https://github.com/flutter/engine/commits/flutter-1.20-candidate.7) (or I am confused): 7/21 test passed when updating the Dart hash to .10 beta (48d9890) 7/27 originally passed all tests (green check) for c88d6b2 and then started failing after the 2.10 tag madness any chance it's pulling in a dependency from master? |
You are right, the format script are apparently added 2 years ago, way before we created the clone_flutter idea. @tvolkert We wrote clone_flutter script since we were planning to add web integration tests back in March. Do we know why other tests (hots, format) always used master? Shall we try to change it since the master gives an error? |
@pcsosinski the Linux Web Test legitimately fails. _platform_web.dart is changed at some point last week, without changing the integration tests. I sent a fix for it on Friday. We need to cherrypick that fix: #20008 |
thanks - but that tells me that the test is the master version. I thought we were branching them? |
They used master because they predate our release branches. They should be updated to pull the correct branch. Thanks! |
Yes, unfortunately I never addressed LUCI. There is a tracing issue for pre-submit: flutter/flutter#53371 Is it possible to ignore these tests? |
@christopherfujino can you please have another look, I added the candidate release names manually as we discussed. fetch_framework one was already edited before. I edited clone_flutter and format scripts. |
@jonahwilliams dart web_sdk/test/api_conform_test.dart running under build.sh is failing. Do you know if it is safe to ignore that test and remove it for now? @pcsosinski I added the candidate branch name to the other places manually. |
Using correct CIRRUS CI flag for getting the branch name.
This fix should have done long ago: https://github.com/flutter/engine/pull/18655/files somehow got forgotten sorry for the inconvenience.