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.

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

Use cname url when blocking (uplift to 1.22.x) #8266

Merged
merged 1 commit into from
Mar 18, 2021

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented Mar 16, 2021

Uplift of #8262
Resolves brave/brave-browser#14756

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 iefremov as a code owner March 16, 2021 15:52
@brave-builds brave-builds requested a review from a team March 16, 2021 15:52
@brave-builds brave-builds self-assigned this Mar 16, 2021
@brave-builds brave-builds added this to the 1.22.x - Beta milestone Mar 16, 2021
@kjozwiak
Copy link
Member

Restarting iOS due to build failing as per https://ci.brave.com/job/pr-brave-browser-pr8262_cname-block-regression_1.22.x-ios/1/execution/node/157/log/.

12:16:12  FAILED: obj/ios/third_party/material_internationalization_ios/material_internationalization_ios/UIImage+MaterialRTL.o 

Restarting pre-init as pylint-report failed as per https://ci.brave.com/job/pr-brave-browser-pr8262_cname-block-regression_1.22.x-pre-init/1/execution/node/136/log/

12:08:31  + rm -f pylint-report.txt
12:08:31  + npm run pylint-report
12:08:31  npm ERR! missing script: pylint-report

post-init failed audit-deps due to a known failure as per https://ci.brave.com/job/pr-brave-browser-pr8262_cname-block-regression_1.22.x-post-init/1/execution/node/144/log/. However, this doesn't block uplift as it's not related to this specific PR.

@kjozwiak
Copy link
Member

Restarting pre-init as pylint-report as it failed again on the same spot as before. Used TERMINATE_NODE & WIPE_WORKSPACE this time around.

[2021-03-17T20:42:09.779Z] + rm -f pylint-report.txt
[2021-03-17T20:42:09.779Z] + npm run pylint-report
[2021-03-17T20:42:10.715Z] npm ERR! missing script: pylint-report

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.22.x approved after deliberating with @brave/uplift-approvers. QA has verified the PR on Nightly as per #8262 (comment).

@kjozwiak kjozwiak merged commit c110def into 1.22.x Mar 18, 2021
@kjozwiak kjozwiak deleted the pr8262_cname-block-regression_1.22.x branch March 18, 2021 05:47
bsclifton added a commit that referenced this pull request Mar 23, 2021
…sion_1.22.x"

This reverts commit c110def, reversing
changes made to 25cd280.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants