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

s/antimuon/brave #67

Merged
merged 3 commits into from
Mar 26, 2018
Merged

s/antimuon/brave #67

merged 3 commits into from
Mar 26, 2018

Conversation

bbondy
Copy link
Member

@bbondy bbondy commented Mar 25, 2018

@bbondy bbondy self-assigned this Mar 25, 2018
@bbondy bbondy requested a review from bridiver March 25, 2018 02:54
@bbondy bbondy requested a review from yrliou March 26, 2018 02:31
@@ -4,7 +4,7 @@
import re
import sys

from lib.config import SOURCE_ROOT, get_antimuon_version, get_chrome_version
from lib.config import SOURCE_ROOT, get_brave_version, get_chrome_version
Copy link
Member

Choose a reason for hiding this comment

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

get_brave_core_version?

DEPS Outdated
"vendor/ad-block": "https://github.com/brave/ad-block.git@84cbd78e346f8276ec06ca8d1193a01aaf0fc67f",
"vendor/tracking-protection": "https://github.com/brave/tracking-protection.git@051177425a14121a22087d754ad8eb1c0ce8fb24",
"vendor/hashset-cpp": "https://github.com/bbondy/hashset-cpp.git@67ffffa69b56e330bab9d08f050727f891c916a1",
"vendor/bloom-filter-cpp": "https://github.com/bbondy/bloom-filter-cpp.git@d511cf872ea1d650ab8dc4662f6036dac012d197",
"vendor/brave-extension": "https://github.com/brave/brave-extension.git@38af139dd65ba6a2a6f84cfc40f214080499dbae",
Copy link
Member

Choose a reason for hiding this comment

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

@@ -16,7 +16,7 @@ def main():
option = sys.argv[1]
increments = ['major', 'minor', 'patch']
if option in increments:
version = get_antimuon_version()
version = get_brave_version()
Copy link
Member

Choose a reason for hiding this comment

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

DITTO

return version.split('+')[1]

def get_antimuon_version():
version = os.environ.get('npm_config_antimuon_version') or brave_package()['version']
def get_brave_core_version():
Copy link
Member

Choose a reason for hiding this comment

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

Some files are using get_brave_version() which seems undefined in this file, and some are using get_brave_core_version(). You may want to change the function name to get_brave_version and use it everywhere in this PR or s/get_brave_version/get_brave_core_version.

@bbondy
Copy link
Member Author

bbondy commented Mar 26, 2018

Nice catch, updated.
There's also this PR in brave-browser repo which needs to land at the same time:
brave/brave-browser#121

@bbondy bbondy merged commit 1614c47 into master Mar 26, 2018
@bsclifton bsclifton deleted the rename branch June 18, 2018 06:29
NejcZdovc added a commit that referenced this pull request Dec 10, 2018
fixed next interval calculation when downloading publishers list
bbondy pushed a commit that referenced this pull request Feb 18, 2019
Add incognito to the extension manifest and set to split mode
fmarier pushed a commit that referenced this pull request Oct 29, 2019
petemill pushed a commit that referenced this pull request Jul 27, 2020
petemill pushed a commit that referenced this pull request Jul 28, 2020
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.

2 participants