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

Simplify gn handlebars patching #26365

Merged
merged 2 commits into from
Nov 6, 2024

Conversation

cdesouza-chromium
Copy link
Collaborator

This PR reformats our handlebars template, to make it easier to see what exactly we are changing compared with the upstream file. It also adds a patch file that can be used to patch an upstream copied content.

Resolves

Submitter Checklist:

  • I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally:
    • npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
    • npm run presubmit wiki, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

This aligns our own handlebars file closer to the upstream one, so it is
easier to compare changes, and therefore to fix recent additions.
-# Copyright 2023 The Chromium Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
+# Copyright (c) 2024 The Brave Authors. All rights reserved.
Copy link
Collaborator

Choose a reason for hiding this comment

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

We probably need to keep the original copyright here?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Done

This change contains the handlebars changes we apply to our own
handlebars file. This commit also adds a patch that can be used to
update the handlebar files, based on new upstream additions.
@cdesouza-chromium
Copy link
Collaborator Author

Created a follow up issue:
brave/brave-browser#42090

@cdesouza-chromium cdesouza-chromium merged commit 0ab239d into master Nov 6, 2024
17 checks passed
@cdesouza-chromium cdesouza-chromium deleted the simplify-gn-handlebars-patching branch November 6, 2024 19:50
@github-actions github-actions bot added this to the 1.75.x - Nightly milestone Nov 6, 2024
cdesouza-chromium added a commit that referenced this pull request Nov 6, 2024
During a recent PR to fix the rust handlebars for gn files, there was a
change to the copyright notice, and then this got overlooked, with the
new handlebars used to regenerate all `BUILD.gn` files with the new
notice. This has rendered a dirty `gnrt` run. This PR adds the updated
files.

This PR also moves the file to its correct place.

[1]#26365
cdesouza-chromium added a commit that referenced this pull request Nov 7, 2024
During a recent PR to fix the rust handlebars for gn files, there was a
change to the copyright notice, and then this got overlooked, with the
new handlebars used to regenerate all `BUILD.gn` files with the new
notice. This has rendered a dirty `gnrt` run. This PR adds the updated
files.

This PR also moves the file to its correct place.

[1]#26365
@brave-builds
Copy link
Collaborator

Released in v1.75.1

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