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

Get context from frame_tree_node_id in AdblockCnameResolveHostClient (uplift to 1.26.x) #8934

Merged
merged 1 commit into from
May 26, 2021

Conversation

brave-builds
Copy link
Collaborator

@brave-builds brave-builds commented May 26, 2021

Uplift of #8921
Resolves brave/brave-browser#16062

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.

@kjozwiak
Copy link
Member

Restarted iOS as build failed as per https://ci.brave.com/job/pr-brave-browser-pr8921_issues-16062_1.26.x-ios/1/execution/node/146/log/.

 FAILED: gen/brave/vendor/brave-ios/ledger.mojom.objc.h gen/brave/vendor/brave-ios/ledger.mojom.objc+private.h gen/brave/vendor/brave-ios/ledger.mojom.objc.mm gen/brave/vendor/brave-ios/objc_templates_bytecode/ledger_objc_templates.zip 
10:34:16  python ../../brave/vendor/brave-ios/scripts/mojo/gen_model_wrappers.py --mojom-module=/Users/jenkins/jenkins/workspace/pr-brave-browser-pr8921_issues-16062_1.26.x-ios/src/out/ios_Release/gen/brave/vendor/bat-native-ledger/include/bat/ledger/public/interfaces/ledger.mojom-module --module-include-path=bat/ledger/public/interfaces --mojom-file=/Users/jenkins/jenkins/workspace/pr-brave-browser-pr8921_issues-16062_1.26.x-ios/src/brave/vendor/bat-native-ledger/include/bat/ledger/public/interfaces/ledger.mojom --output-dir=/Users/jenkins/jenkins/workspace/pr-brave-browser-pr8921_issues-16062_1.26.x-ios/src/out/ios_Release/gen/brave/vendor/brave-ios
10:34:16  Traceback (most recent call last):
10:34:16    File "../../brave/vendor/brave-ios/scripts/mojo/gen_model_wrappers.py", line 47, in <module>
10:34:16      sys.exit(main())
10:34:16    File "../../brave/vendor/brave-ios/scripts/mojo/gen_model_wrappers.py", line 44, in main
10:34:16      generator.GenerateFiles(output_dir)
10:34:16    File "/Users/jenkins/jenkins/workspace/pr-brave-browser-pr8921_issues-16062_1.26.x-ios/src/brave/vendor/brave-ios/scripts/mojo/mojom_objc_generator.py", line 399, in GenerateFiles
10:34:16      self.Write(self._GenerateModuleHeader(),
10:34:16    File "/Users/jenkins/jenkins/workspace/pr-brave-browser-pr8921_issues-16062_1.26.x-ios/src/brave/vendor/brave-ios/scripts/mojo/../../../../../mojo/public/tools/mojom/mojom/generate/template_expander.py", line 35, in GeneratorInternal
10:34:16      return ApplyTemplate(args[0], path_to_template, parameters, **kwargs)
10:34:16    File "/Users/jenkins/jenkins/workspace/pr-brave-browser-pr8921_issues-16062_1.26.x-ios/src/brave/vendor/brave-ios/scripts/mojo/../../../../../mojo/public/tools/mojom/mojom/generate/template_expander.py", line 27, in ApplyTemplate
10:34:16      template = jinja_env.get_template(path_to_template)
10:34:16    File "/Users/jenkins/jenkins/workspace/pr-brave-browser-pr8921_issues-16062_1.26.x-ios/src/third_party/jinja2/environment.py", line 830, in get_template
10:34:16      return self._load_template(name, self.make_globals(globals))
10:34:16    File "/Users/jenkins/jenkins/workspace/pr-brave-browser-pr8921_issues-16062_1.26.x-ios/src/third_party/jinja2/environment.py", line 804, in _load_template
10:34:16      template = self.loader.load(self, name, globals)
10:34:16    File "/Users/jenkins/jenkins/workspace/pr-brave-browser-pr8921_issues-16062_1.26.x-ios/src/third_party/jinja2/loaders.py", line 474, in load
10:34:16      raise TemplateNotFound(name)
10:34:16  jinja2.exceptions.TemplateNotFound: module.h.tmpl

post-init failed due to several warning(s) via audit-deps as per https://ci.brave.com/job/pr-brave-browser-pr8921_issues-16062_1.26.x-post-init/1/execution/node/144/log/. However, this is a known issue and unrelated to this specific PR.

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.26.x approved after deliberating with @brave/uplift-approvers.

@kjozwiak kjozwiak merged commit 9800dcb into 1.26.x May 26, 2021
@kjozwiak kjozwiak deleted the pr8921_issues/16062_1.26.x branch May 26, 2021 22:54
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