-
Notifications
You must be signed in to change notification settings - Fork 868
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
Upgrade patches from Chromium 76.0.3809.62 to Chromium 76.0.3809.72 #2976
Changes from all commits
78809b2
632498a
11452d5
2c096cc
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,11 @@ | ||
diff --git a/chrome/VERSION b/chrome/VERSION | ||
index e05d1f3aaf621bae4c2448a8dd9ee80a90b2321b..6f14cd915f02f2a05d0d78ad5fba93f7ae33267d 100644 | ||
index 556db09bacc7ecdd8fefe44172fcd20866c2c7fc..4caee6d1e089996ef39511610a955ee6f387e5c8 100644 | ||
--- a/chrome/VERSION | ||
+++ b/chrome/VERSION | ||
@@ -1,4 +1,4 @@ | ||
MAJOR=76 | ||
MINOR=0 | ||
-BUILD=3809 | ||
-PATCH=62 | ||
-PATCH=72 | ||
+BUILD=70 | ||
+PATCH=4 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
diff --git a/chrome/installer/mac/sign_chrome.py b/chrome/installer/mac/sign_chrome.py | ||
index fa3a88200f5156975d0da5bcc52ed6f9896e792e..9068adc58127d24f50f47b3f1f939e2b6feaef69 100755 | ||
--- a/chrome/installer/mac/sign_chrome.py | ||
+++ b/chrome/installer/mac/sign_chrome.py | ||
@@ -28,6 +28,7 @@ def create_config(config_args, development): | ||
An instance of |model.CodeSignConfig|. | ||
""" | ||
config_class = config.CodeSignConfig | ||
+ """ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This section needs to be commented out because There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think we can still use this as you do in the sign_brave.py. I'm porting their recent changes from There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's the section where they do the import of their config that I commented out here in the patch, not the config_class, github's snippet isn't helping here. |
||
try: | ||
import signing.internal_config | ||
config_class = signing.internal_config.InternalCodeSignConfig | ||
@@ -36,6 +37,7 @@ def create_config(config_args, development): | ||
# internal config has to be available. | ||
if config_class(identity, keychain).product == 'Google Chrome': | ||
raise e | ||
+ """ | ||
|
||
if development: | ||
|
||
@@ -55,6 +57,8 @@ def create_config(config_args, development): | ||
|
||
config_class = DevelopmentCodeSignConfig | ||
|
||
+ from signing_helper import GetBraveSigningConfig | ||
+ config_class = GetBraveSigningConfig(config_class, development) | ||
return config_class(*config_args) | ||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@mbacchi, chrome/installer/mac/sign_chrome.py now takes --notarize/--no-notarize, --notary-user, and --notary-password arguments. Possibly, we can use their script for notarization? We aren't creating dmg in this step, so it would have to be notarized separately.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's the approach I'm taking right now, I'm trying to leverage their scripts as much as possible. I'm getting close to something that I can get your opinion on.