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

Bap modal update android (uplift to 1.21.x) #7989

Merged
merged 1 commit into from
Feb 18, 2021
Merged

Bap modal update android (uplift to 1.21.x) #7989

merged 1 commit into from
Feb 18, 2021

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Feb 17, 2021 •
edited by kjozwiak
Loading

Uplift of #7985
Resolves brave/brave-browser#14136

Pre-approval checklist:

  • You have tested your change on Nightly.
  • This contains text which needs to be translated.
    • There are more than 7 days before the release.
    • I've notified folks in #l10n on Slack that translations are needed.
  • The PR milestones match the branch they are landing to.

Pre-merge checklist:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.

Post-merge checklist:

  • The associated issue milestone is set to the smallest version that the changes is landed on.

@brave-builds brave-builds requested a review from a team February 17, 2021 20:11
@brave-builds brave-builds self-assigned this Feb 17, 2021
@brave-builds brave-builds added this to the 1.21.x - Beta milestone Feb 17, 2021
@deeppandya deeppandya added CI/skip-ios Do not run CI builds for iOS CI/skip-linux CI/skip-macos-x64 Do not run CI builds for macOS x64 labels Feb 17, 2021
@kjozwiak
Copy link
Member

@deeppandya looks like Android failed init as per https://ci.brave.com/job/pr-brave-browser-pr7985_bap_modal_update_android_1.21.x-android/1/execution/node/130/log/.

[2021-02-17T20:41:37.974Z] 2 failed patches:
[2021-02-17T20:41:37.974Z] chrome/VERSION
[2021-02-17T20:41:37.975Z]   - Patch applied because: No corresponding .patchinfo file was found.
[2021-02-17T20:41:37.975Z]   - Error - Program git exited with error code 1.
[2021-02-17T20:41:37.975Z] error: patch failed: chrome/VERSION:1
[2021-02-17T20:41:37.975Z] error: chrome/VERSION: patch does not apply
[2021-02-17T20:41:37.975Z] 
[2021-02-17T20:41:37.975Z] -------------------------------
[2021-02-17T20:41:37.975Z] chrome/installer/linux/BUILD.gn
[2021-02-17T20:41:37.975Z]   - Patch applied because: No corresponding .patchinfo file was found.
[2021-02-17T20:41:37.975Z]   - Error - Program git exited with error code 1.
[2021-02-17T20:41:37.975Z] error: patch failed: chrome/installer/linux/BUILD.gn:168
[2021-02-17T20:41:37.975Z] error: chrome/installer/linux/BUILD.gn: patch does not apply

@kjozwiak
Copy link
Member

Looks like Android failed again due to the same reason as mentioned in #7989 (comment) as per https://ci.brave.com/job/pr-brave-browser-pr7985_bap_modal_update_android_1.21.x-android/4/execution/node/130/log/.

Going to restart using WIPE_WORKSPACE which hopefully helps.

@justnom justnom force-pushed the pr7985_bap_modal_update_android_1.21.x branch from 12d7e1e to 5d69412 Compare February 17, 2021 22:25
@justnom justnom force-pushed the pr7985_bap_modal_update_android_1.21.x branch from 5d69412 to bdcc1e4 Compare February 17, 2021 22:56
kjozwiak
kjozwiak approved these changes Feb 18, 2021
View reviewed changes
Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

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

Uplift into 1.21.x approved after deliberating with @brave/uplift-approvers.

@kjozwiak kjozwiak merged commit 90d478c into 1.21.x Feb 18, 2021
@kjozwiak kjozwiak deleted the pr7985_bap_modal_update_android_1.21.x branch February 18, 2021 01:30
bsclifton added a commit that referenced this pull request Feb 26, 2021
@bsclifton
Revert "Merge pull request #7989 from brave/pr7985_bap_modal_update_a…
d464263 
…ndroid_1.21.x"

This reverts commit 90d478c, reversing
changes made to 0f5ace7.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kjozwiak kjozwiak kjozwiak approved these changes

Assignees

@brave-builds brave-builds

Labels
CI/skip-ios Do not run CI builds for iOS CI/skip-macos-x64 Do not run CI builds for macOS x64
Projects
None yet
Milestone
1.21.x - Release
Development

Successfully merging this pull request may close these issues.
4 participants
@brave-builds @kjozwiak @deeppandya @brave-browser-releases