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

[RunAllTests] Fix part of #3974: Cherry-pick MR3 release blocker fixes #3975

Merged
merged 5 commits into from
Oct 29, 2021
Merged

[RunAllTests] Fix part of #3974: Cherry-pick MR3 release blocker fixes #3975

merged 5 commits into from
Oct 29, 2021

Conversation

BenHenning
Copy link
Sponsor Member

@BenHenning BenHenning commented Oct 27, 2021 •
edited

Explanation

Fix part of #3974

This branch cherry-picks the following commits into the release-0.6 branch:

Please compare against the base PRs if you want to verify the correctness of the cherry-picks. Note that none of them introduced conflicts, so all five cherry-picks were clean.

Essential Checklist

  • The PR title and explanation each start with "Fix #bugnum: " (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
  • Any changes to scripts/assets files have their rationale included in the PR explanation.
  • The PR follows the style guide.
  • The PR does not contain any unnecessary code changes from Android Studio (reference).
  • The PR is made from a branch that's not called "develop" and is up-to-date with "develop". (N/A -- this PR is changing a release branch)
  • The PR is assigned to the appropriate reviewers (reference).

For UI-specific PRs only

N/A -- this isn't changing functionality, it's cherry-picking already approved PRs with no additional changes.

@BenHenning
Fix #3946: Fix solution automatically revealing after first hint reve…
dd8416d 
…al (#3955)

* Fix solution auto showing after hint reveal.

See #3946 & PR for specifics.

* Add translations for new hint/solution.

* Lint fixes.

* Add TODO.

* Fix Gradle-variant tests.
@BenHenning
Fix #3937: Ensure ViewEventLogsViewModel builds for alpha builds (#3957)
65f9c0d 
* Ensure ViewEventLogsViewModel builds for alpha.

* BUILD file lint fix.
@BenHenning
Fix #3939 & #3938: Fix KitKat crash & SVG rendering issues (#3963)
667b6f3 
* Fix KitKat crash when opening Help menu.

* Fix SVG rendering on SDKs 19-23 (incl).

* Add regex check to prohibit Delegates.

* Lint fixes.

* Add exemption for regex script test.

* Update file_content_validation_checks.textproto

Grammar fix in error.

* Update RegexPatternValidationCheckTest.kt

Copy grammar fix to test copy of error.
@BenHenning
Update version.bzl (#3964)
5378396 
Bump version codes for another RC of release-0.6.
@BenHenning
Embed proguard.map in optimized AAB builds. (#3973)
1efe70a
@BenHenning BenHenning changed the title Fix #3974: Cherry-pick release blocker fixes Fix part of #3974: Cherry-pick release blocker fixes Oct 27, 2021
@BenHenning BenHenning closed this Oct 27, 2021
@BenHenning BenHenning changed the title Fix part of #3974: Cherry-pick release blocker fixes [RunAllTests] Fix part of #3974: Cherry-pick release blocker fixes Oct 27, 2021
@BenHenning
Copy link
Sponsor Member Author

Reopening the branch with a specific indication that all tests should be run as part of this PR (I suspect that most will be, anyway, given that the affected files).

@BenHenning BenHenning reopened this Oct 27, 2021
@BenHenning BenHenning changed the title [RunAllTests] Fix part of #3974: Cherry-pick release blocker fixes [RunAllTests] Fix part of #3974: Cherry-pick MR3 release blocker fixes Oct 27, 2021
@BenHenning BenHenning marked this pull request as ready for review October 28, 2021 22:24
@BenHenning
Copy link
Sponsor Member Author

@rt4914 PTAL for codeowners (though I'm happy if you just rubberstamp this since you've already approved the develop version of these changes & it was a clean cherry-pick).

@anandwana001 can you please take a quick pass on this and make sure that it essentially matches the cherry-picked PRs? I'd expect this to be a quick verification since the cherry-picks were clean. I'll be manually verifying the fixes & functionality when I do the release tomorrow after this is merged.

anandwana001
anandwana001 approved these changes Oct 29, 2021
View reviewed changes
Copy link
Contributor

@anandwana001 anandwana001 left a comment

Choose a reason for hiding this comment

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

LGTM

@oppiabot
Copy link

oppiabot bot commented Oct 29, 2021

Unassigning @anandwana001 since they have already approved the PR.

@BenHenning
Copy link
Sponsor Member Author

Thanks @anandwana001!

rt4914
rt4914 approved these changes Oct 29, 2021
View reviewed changes
Copy link
Contributor

@rt4914 rt4914 left a comment

Choose a reason for hiding this comment

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

LgTM thanks.

@oppiabot oppiabot bot unassigned rt4914 Oct 29, 2021
@oppiabot
Copy link

oppiabot bot commented Oct 29, 2021

Unassigning @rt4914 since they have already approved the PR.

@oppiabot oppiabot bot added the PR: LGTM label Oct 29, 2021
@oppiabot
Copy link

oppiabot bot commented Oct 29, 2021

Hi @BenHenning, this PR is ready to be merged. Please address any remaining comments prior to merging, and feel free to merge this PR once the CI checks pass and you're happy with it. Thanks!

@BenHenning
Copy link
Sponsor Member Author

Thanks all! Merging this to unblock the (hopefully) last RC for MR3.

@BenHenning BenHenning merged commit 0506c5d into release-0.6 Oct 29, 2021
@BenHenning BenHenning deleted the cherry-pick-release-blocker-fixes branch October 29, 2021 19:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rt4914 rt4914 rt4914 approved these changes

@anandwana001 anandwana001 anandwana001 approved these changes

Assignees

@BenHenning BenHenning

Labels
PR: LGTM
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@BenHenning @rt4914 @anandwana001