Apply brave version to chrome/VERSION #258

simonhong · 2018-07-16T02:13:13Z

Set brave version to chrome/VERSION.

Using chromium and brave version both internally can case version inconsistency and make windows update logic complex.
To simplify use brave version and only visible chromium version in some places such as about/version and user agent.

#249 should be reverted for using this.

Close brave/brave-browser#553

Submitter Checklist:

Submitted a ticket for my issue if one did not already exist.
Used Github auto-closing keywords in the commit message.
Added/updated tests for this change (for new code or code which already has tests).
Ran git rebase -i to squash commits (if needed).
Tagged reviewers and labelled the pull request as needed.
Request a security/privacy review as needed.

Test Plan:

Reviewer Checklist:

New files have MPL-2.0 license header.
Request a security/privacy review as needed.
Adequate test coverage exists to prevent regressions

simonhong · 2018-07-16T10:43:02Z

Mac signing is failed when create_dist with this PR.
Below error was fixed by xattr -cr <path_to_app_bundle> from SO.

[697/715] ACTION //brave/build/mac:sign_app(//build/toolchain/mac:clang_x64)
FAILED: signing/Brave-Browser-Dev.app
python ../../build/gn_run_binary.py ../../brave/build/mac/sign_app.sh /Users/simonhong/Projects/brave/brave-browser/src/out/Release/Brave.app /Users/simonhong/Projects/brave/brave-browser/src/out/Release/signing/Brave-Browser-Dev.app /Users/simonhong/Projects/brave/brave-browser/src/out/Release/Brave\ Packaging /Users/simonhong/Library/Keychains/login.login-db 40D43D0858B39D93BA0A5EEFCA57CE9D5E169526

function check_exit() {
    return=$?;
    if [[ $return -eq 0 ]]; then
  echo "[INFO] $0 succeded"
    else
  echo "[ERROR] $0 failed"
    fi

    exit $return
}

trap check_exit EXIT

if [[ -d "$DEST" ]]; then
  rm -rf "$DEST"
fi

mkdir -p "$(dirname $DEST)"
dirname $DEST

cp -a "$SOURCE" "$DEST"

"${PKG_DIR}/sign_versioned_dir.sh" "$DEST" "$MAC_SIGNING_KEYCHAIN" "$MAC_SIGNING_IDENTIFIER"
Executable=/Users/simonhong/Projects/brave/brave-browser/src/out/Release/signing/Brave-Browser-Dev.app/Contents/Versions/67.0.50.10/Brave Framework.framework/Versions/A/Helpers/crashpad_handler
Identifier=crashpad_handler
Format=Mach-O thin (x86_64)
CodeDirectory v=20200 size=3792 flags=0x2800(restrict,library-validation) hashes=114+2 location=embedded
OSPlatform=36
OSSDKVersion=658688
OSVersionMin=657664
Hash type=sha256 size=32
CandidateCDHash sha1=79f28385c535b578237470ebf06ea97606ab70f5
CandidateCDHash sha256=cf9ab646b7eb8cf8be7bcfe0a2eb90fb2c60768f
Hash choices=sha1,sha256
Page size=4096
    -2=8f4b24c81a26dea3eb4e2146dedcf1e0cb33c126ffbd9ef6771b53489291dece
CDHash=cf9ab646b7eb8cf8be7bcfe0a2eb90fb2c60768f
Signature size=4690
Authority=Mac Developer: [email protected] (ZB57HVUK5X)
Authority=Apple Worldwide Developer Relations Certification Authority
Authority=Apple Root CA
Signed Time=16 Jul 2018 at 17:40:52
Info.plist=not bound
TeamIdentifier=UPXY43N8JX
Sealed Resources=none
designated => identifier "crashpad_handler" and (certificate leaf = H"40d43d0858b39d93ba0a5eefca57ce9d5e169526" or certificate leaf = H"40d43d0858b39d93ba0a5eefca57ce9d5e169526")
/Users/simonhong/Projects/brave/brave-browser/src/out/Release/signing/Brave-Browser-Dev.app/Contents/Versions/67.0.50.10/Brave Framework.framework/Helpers/crashpad_handler: valid on disk
/Users/simonhong/Projects/brave/brave-browser/src/out/Release/signing/Brave-Browser-Dev.app/Contents/Versions/67.0.50.10/Brave Framework.framework/Helpers/crashpad_handler: satisfies its Designated Requirement
Executable=/Users/simonhong/Projects/brave/brave-browser/src/out/Release/signing/Brave-Browser-Dev.app/Contents/Versions/67.0.50.10/Brave Framework.framework/Versions/A/Resources/app_mode_loader.app/Contents/MacOS/app_mode_loader
Identifier=app_mode_loader
Format=app bundle with Mach-O thin (x86_64)
CodeDirectory v=20200 size=44207 flags=0x2800(restrict,library-validation) hashes=1377+2 location=embedded
OSPlatform=36
OSSDKVersion=658688
OSVersionMin=657664
Hash type=sha256 size=32
CandidateCDHash sha1=3b9a1072dbbc6fb1a8c06a97647f297344ef9917
CandidateCDHash sha256=25bd187728b28e5a4e79df95c812771d49d211e7
Hash choices=sha1,sha256
Page size=4096
    -2=f5187d34dce1bdc47f8ca5672967819a5ff987648a8c18cea8ecb1e9053be264
CDHash=25bd187728b28e5a4e79df95c812771d49d211e7
Signature size=4690
Authority=Mac Developer: [email protected] (ZB57HVUK5X)
Authority=Apple Worldwide Developer Relations Certification Authority
Authority=Apple Root CA
Signed Time=16 Jul 2018 at 17:40:52
Info.plist=not bound
TeamIdentifier=UPXY43N8JX
Sealed Resources=none
designated => identifier "app_mode_loader" and (certificate leaf = H"40d43d0858b39d93ba0a5eefca57ce9d5e169526" or certificate leaf = H"40d43d0858b39d93ba0a5eefca57ce9d5e169526")
/Users/simonhong/Projects/brave/brave-browser/src/out/Release/signing/Brave-Browser-Dev.app/Contents/Versions/67.0.50.10/Brave Framework.framework/Resources/app_mode_loader.app/Contents/MacOS/app_mode_loader: valid on disk (not all contents verified)
/Users/simonhong/Projects/brave/brave-browser/src/out/Release/signing/Brave-Browser-Dev.app/Contents/Versions/67.0.50.10/Brave Framework.framework/Resources/app_mode_loader.app/Contents/MacOS/app_mode_loader: satisfies its Designated Requirement
Executable=/Users/simonhong/Projects/brave/brave-browser/src/out/Release/signing/Brave-Browser-Dev.app/Contents/Versions/67.0.50.10/Brave Framework.framework/Versions/A/XPCServices/AlertNotificationService.xpc/Contents/MacOS/AlertNotificationService
Identifier=org.brave.Brave.framework.AlertNotificationService
Format=bundle with Mach-O thin (x86_64)
CodeDirectory v=20200 size=754 flags=0x2800(restrict,library-validation) hashes=17+3 location=embedded
OSPlatform=36
OSSDKVersion=658688
OSVersionMin=657664
Hash type=sha256 size=32
CandidateCDHash sha1=9622e49517356ec2e5ba897dafdce4bc146f47db
CandidateCDHash sha256=a5a6abd4ba1e6a35bc22a29cdd94c7f0a2af423b
Hash choices=sha1,sha256
Page size=4096
    -3=6686de10a28a2fe11b36cbb86dcbacc827cfc4ea116b4dabf1845e5aee629e9b
    -2=737cddae6d10e451f9d9900dc9c23dde85887f8e251d168a14b24a69d6028627
CDHash=a5a6abd4ba1e6a35bc22a29cdd94c7f0a2af423b
Signature size=4690
Authority=Mac Developer: [email protected] (ZB57HVUK5X)
Authority=Apple Worldwide Developer Relations Certification Authority
Authority=Apple Root CA
Signed Time=16 Jul 2018 at 17:40:53
Info.plist entries=18
TeamIdentifier=UPXY43N8JX
Sealed Resources version=2 rules=13 files=0
designated => identifier "org.brave.Brave.framework.AlertNotificationService" and (certificate leaf = H"40d43d0858b39d93ba0a5eefca57ce9d5e169526" or certificate leaf = H"40d43d0858b39d93ba0a5eefca57ce9d5e169526")
/Users/simonhong/Projects/brave/brave-browser/src/out/Release/signing/Brave-Browser-Dev.app/Contents/Versions/67.0.50.10/Brave Framework.framework/XPCServices/AlertNotificationService.xpc: valid on disk
/Users/simonhong/Projects/brave/brave-browser/src/out/Release/signing/Brave-Browser-Dev.app/Contents/Versions/67.0.50.10/Brave Framework.framework/XPCServices/AlertNotificationService.xpc: satisfies its Designated Requirement
Executable=/Users/simonhong/Projects/brave/brave-browser/src/out/Release/signing/Brave-Browser-Dev.app/Contents/Versions/67.0.50.10/Brave Framework.framework/Versions/Current/Brave Framework
Identifier=org.brave.Brave.framework
Format=bundle with Mach-O thin (x86_64)
CodeDirectory v=20200 size=985785 flags=0x0(none) hashes=30800+3 location=embedded
OSPlatform=36
OSSDKVersion=658688
OSVersionMin=657664
Hash type=sha256 size=32
CandidateCDHash sha1=1a1f8aba5bdf2f5ca47abcc87301e18a23ddc9d9
CandidateCDHash sha256=2b51d74e5dd1cadc2ec29c0fb84ae6db1dfcad8c
Hash choices=sha1,sha256
Page size=4096
    -3=29abb5233e7efed6a8ac290538c7c5d0843e517a9c96aa62548528bcd24dad09
    -2=2fd02a03a367820da61162a32ecffaa02db21b576666d3ca39f57e07823ae104
CDHash=2b51d74e5dd1cadc2ec29c0fb84ae6db1dfcad8c
Signature size=4690
Authority=Mac Developer: [email protected] (ZB57HVUK5X)
Authority=Apple Worldwide Developer Relations Certification Authority
Authority=Apple Root CA
Signed Time=16 Jul 2018 at 17:40:55
Info.plist entries=15
TeamIdentifier=UPXY43N8JX
Sealed Resources version=2 rules=13 files=143
designated => identifier "org.brave.Brave.framework" and (certificate leaf = H"40d43d0858b39d93ba0a5eefca57ce9d5e169526" or certificate leaf = H"40d43d0858b39d93ba0a5eefca57ce9d5e169526")
--prepared:/Users/simonhong/Projects/brave/brave-browser/src/out/Release/signing/Brave-Browser-Dev.app/Contents/Versions/67.0.50.10/Brave Framework.framework/Versions/Current/XPCServices/AlertNotificationService.xpc
--validated:/Users/simonhong/Projects/brave/brave-browser/src/out/Release/signing/Brave-Browser-Dev.app/Contents/Versions/67.0.50.10/Brave Framework.framework/Versions/Current/XPCServices/AlertNotificationService.xpc
--prepared:/Users/simonhong/Projects/brave/brave-browser/src/out/Release/signing/Brave-Browser-Dev.app/Contents/Versions/67.0.50.10/Brave Framework.framework/Versions/Current/Helpers/crashpad_handler
--validated:/Users/simonhong/Projects/brave/brave-browser/src/out/Release/signing/Brave-Browser-Dev.app/Contents/Versions/67.0.50.10/Brave Framework.framework/Versions/Current/Helpers/crashpad_handler
--prepared:/Users/simonhong/Projects/brave/brave-browser/src/out/Release/signing/Brave-Browser-Dev.app/Contents/Versions/67.0.50.10/Brave Framework.framework/Versions/Current/Frameworks/Sparkle.framework/Versions/Current/.
--validated:/Users/simonhong/Projects/brave/brave-browser/src/out/Release/signing/Brave-Browser-Dev.app/Contents/Versions/67.0.50.10/Brave Framework.framework/Versions/Current/Frameworks/Sparkle.framework/Versions/Current/.
/Users/simonhong/Projects/brave/brave-browser/src/out/Release/signing/Brave-Browser-Dev.app/Contents/Versions/67.0.50.10/Brave Framework.framework: valid on disk
/Users/simonhong/Projects/brave/brave-browser/src/out/Release/signing/Brave-Browser-Dev.app/Contents/Versions/67.0.50.10/Brave Framework.framework: satisfies its Designated Requirement
Executable=/Users/simonhong/Projects/brave/brave-browser/src/out/Release/signing/Brave-Browser-Dev.app/Contents/Versions/67.0.50.10/Brave Framework.framework/Versions/Current/Brave Framework
Identifier=org.brave.Brave.framework
Format=bundle with Mach-O thin (x86_64)
CodeDirectory v=20200 size=985785 flags=0x0(none) hashes=30800+3 location=embedded
OSPlatform=36
OSSDKVersion=658688
OSVersionMin=657664
Hash type=sha256 size=32
CandidateCDHash sha1=1a1f8aba5bdf2f5ca47abcc87301e18a23ddc9d9
CandidateCDHash sha256=2b51d74e5dd1cadc2ec29c0fb84ae6db1dfcad8c
Hash choices=sha1,sha256
Page size=4096
    -3=29abb5233e7efed6a8ac290538c7c5d0843e517a9c96aa62548528bcd24dad09
    -2=2fd02a03a367820da61162a32ecffaa02db21b576666d3ca39f57e07823ae104
CDHash=2b51d74e5dd1cadc2ec29c0fb84ae6db1dfcad8c
Signature size=4690
Authority=Mac Developer: [email protected] (ZB57HVUK5X)
Authority=Apple Worldwide Developer Relations Certification Authority
Authority=Apple Root CA
Signed Time=16 Jul 2018 at 17:40:55
Info.plist entries=15
TeamIdentifier=UPXY43N8JX
Sealed Resources version=2 rules=13 files=143
designated => identifier "org.brave.Brave.framework" and (certificate leaf = H"40d43d0858b39d93ba0a5eefca57ce9d5e169526" or certificate leaf = H"40d43d0858b39d93ba0a5eefca57ce9d5e169526")
--prepared:/Users/simonhong/Projects/brave/brave-browser/src/out/Release/signing/Brave-Browser-Dev.app/Contents/Versions/67.0.50.10/Brave Framework.framework/Versions/Current/XPCServices/AlertNotificationService.xpc
--validated:/Users/simonhong/Projects/brave/brave-browser/src/out/Release/signing/Brave-Browser-Dev.app/Contents/Versions/67.0.50.10/Brave Framework.framework/Versions/Current/XPCServices/AlertNotificationService.xpc
--prepared:/Users/simonhong/Projects/brave/brave-browser/src/out/Release/signing/Brave-Browser-Dev.app/Contents/Versions/67.0.50.10/Brave Framework.framework/Versions/Current/Helpers/crashpad_handler
--validated:/Users/simonhong/Projects/brave/brave-browser/src/out/Release/signing/Brave-Browser-Dev.app/Contents/Versions/67.0.50.10/Brave Framework.framework/Versions/Current/Helpers/crashpad_handler
--prepared:/Users/simonhong/Projects/brave/brave-browser/src/out/Release/signing/Brave-Browser-Dev.app/Contents/Versions/67.0.50.10/Brave Framework.framework/Versions/Current/Frameworks/Sparkle.framework/Versions/Current/.
--validated:/Users/simonhong/Projects/brave/brave-browser/src/out/Release/signing/Brave-Browser-Dev.app/Contents/Versions/67.0.50.10/Brave Framework.framework/Versions/Current/Frameworks/Sparkle.framework/Versions/Current/.
/Users/simonhong/Projects/brave/brave-browser/src/out/Release/signing/Brave-Browser-Dev.app/Contents/Versions/67.0.50.10/Brave Framework.framework: valid on disk
/Users/simonhong/Projects/brave/brave-browser/src/out/Release/signing/Brave-Browser-Dev.app/Contents/Versions/67.0.50.10/Brave Framework.framework: satisfies its Designated Requirement
Executable=/Users/simonhong/Projects/brave/brave-browser/src/out/Release/signing/Brave-Browser-Dev.app/Contents/Versions/67.0.50.10/Brave Helper.app/Contents/MacOS/Brave Helper
Identifier=org.brave.Brave.helper
Format=app bundle with Mach-O thin (x86_64)
CodeDirectory v=20200 size=694 flags=0x800(restrict) hashes=16+3 location=embedded
OSPlatform=36
OSSDKVersion=658688
OSVersionMin=657664
Hash type=sha256 size=32
CandidateCDHash sha1=6848c43a69859ebe909e78cc8cf68563be8142cf
CandidateCDHash sha256=167eb1ab3cdcf0cdf25d54c4e0ba8daea4a5209c
Hash choices=sha1,sha256
Page size=4096
    -3=6686de10a28a2fe11b36cbb86dcbacc827cfc4ea116b4dabf1845e5aee629e9b
    -2=9f61b3ce3719744cac98a58ef38294ab6e6489cc33e8f665971e0b6f1d76a3e4
CDHash=167eb1ab3cdcf0cdf25d54c4e0ba8daea4a5209c
Signature size=4690
Authority=Mac Developer: [email protected] (ZB57HVUK5X)
Authority=Apple Worldwide Developer Relations Certification Authority
Authority=Apple Root CA
Signed Time=16 Jul 2018 at 17:40:55
Info.plist entries=20
TeamIdentifier=UPXY43N8JX
Sealed Resources version=2 rules=13 files=0
designated => identifier "org.brave.Brave.helper" and (certificate leaf = H"40d43d0858b39d93ba0a5eefca57ce9d5e169526" or certificate leaf = H"40d43d0858b39d93ba0a5eefca57ce9d5e169526")
/Users/simonhong/Projects/brave/brave-browser/src/out/Release/signing/Brave-Browser-Dev.app/Contents/Versions/67.0.50.10/Brave Helper.app: valid on disk
/Users/simonhong/Projects/brave/brave-browser/src/out/Release/signing/Brave-Browser-Dev.app/Contents/Versions/67.0.50.10/Brave Helper.app: satisfies its Designated Requirement

"${PKG_DIR}/sign_app.sh" "$DEST" "$MAC_SIGNING_KEYCHAIN" "$MAC_SIGNING_IDENTIFIER"
/Users/simonhong/Projects/brave/brave-browser/src/out/Release/signing/Brave-Browser-Dev.app: resource fork, Finder information, or similar detritus not allowed
check_exit
[ERROR] ./../../brave/build/mac/sign_app.sh failed
../../brave/build/mac/sign_app.sh failed with exit code 1
^Cninja: build stopped: interrupted by user.

simonhong · 2018-07-16T13:51:01Z

On windows, install/update works.

On MacOS, update test is failed.
When I installed locally 50.10 version, and uploaded 50.11 dmg to test server.
After downloading, install was failed.
However, the old one(3396.xx) @RyanJarv uploaded is updated well on 50.11.
@RyanJarv , Is there missing things like signing or something when image upload?

bbondy · 2018-07-16T17:55:35Z

chromium_src/components/version_info/version_info_values.h

+#include "gen/components/version_info/version_info_values.h"
+
+#define CHROMIUM_VERSION 67,0,3396,103
+#define CHROMIUM_VERSION_STRING "67.0.3396.103"


Can this just be a generated file instead?

Possibly from brave/brave-browser after init?

or even better by using gen dir with brave-core

bbondy

We can do changes in a followup. I asked @RyanJarv and he said he could try to see if it works once merged.

bbondy

We can do changes in a followup. I asked @RyanJarv and he said he could try to see if it works once merged.

bbondy · 2018-07-16T18:07:48Z

chromium_src/components/version_info/version_info_values.h

@@ -0,0 +1,4 @@
+#include "gen/components/version_info/version_info_values.h"
+
+#define CHROMIUM_VERSION 67,0,3396,103


why is CHROMIUM_VERSION needed?

simonhong · 2018-07-17T01:26:21Z

Comments are addressed by #260

Fix npm dependency

Apply brave version to chrome/VERSION

cbfc037

simonhong added the pr/work-in-progress label Jul 16, 2018

simonhong self-assigned this Jul 16, 2018

simonhong mentioned this pull request Jul 16, 2018

Prepare for dev release brave/brave-browser#396

Closed

12 tasks

simonhong requested a review from bbondy July 16, 2018 13:45

simonhong removed the pr/work-in-progress label Jul 16, 2018

simonhong changed the title ~~WIP: Apply brave version to chrome/VERSION~~ Apply brave version to chrome/VERSION Jul 16, 2018

bbondy reviewed Jul 16, 2018

View reviewed changes

bbondy approved these changes Jul 16, 2018

View reviewed changes

bbondy merged commit 964c1fa into master Jul 16, 2018

bbondy reviewed Jul 16, 2018

View reviewed changes

simonhong mentioned this pull request Jul 17, 2018

Use define for exposing brave/chromium version instead of using generated file #260

Merged

9 tasks

simonhong deleted the apply_brave_version_to_version_file branch August 19, 2018 23:22

simonhong mentioned this pull request Dec 31, 2018

Our own version number isn't displayed at some UIs brave/brave-browser#2764

Open

fmarier pushed a commit that referenced this pull request Oct 29, 2019

Merge pull request #258 from srirambv/fixnpm

41b04f0

Fix npm dependency

MarkBuffalo mentioned this pull request Feb 17, 2023

[Snyk] Upgrade @glif/filecoin-wallet-provider from 2.0.0-beta.12 to 2.0.28 MarkBuffalo/brave-core#5

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Apply brave version to chrome/VERSION #258

Apply brave version to chrome/VERSION #258

simonhong commented Jul 16, 2018 •

edited

Loading

simonhong commented Jul 16, 2018 •

edited

Loading

simonhong commented Jul 16, 2018 •

edited

Loading

bbondy Jul 16, 2018

bbondy Jul 16, 2018

bbondy Jul 16, 2018

bbondy left a comment

bbondy left a comment

bbondy Jul 16, 2018

simonhong commented Jul 17, 2018

		@@ -0,0 +1,4 @@
		#include "gen/components/version_info/version_info_values.h"

		#define CHROMIUM_VERSION 67,0,3396,103

Apply brave version to chrome/VERSION #258

Apply brave version to chrome/VERSION #258

Conversation

simonhong commented Jul 16, 2018 • edited Loading

Submitter Checklist:

Test Plan:

Reviewer Checklist:

simonhong commented Jul 16, 2018 • edited Loading

simonhong commented Jul 16, 2018 • edited Loading

bbondy Jul 16, 2018

Choose a reason for hiding this comment

bbondy Jul 16, 2018

Choose a reason for hiding this comment

bbondy Jul 16, 2018

Choose a reason for hiding this comment

bbondy left a comment

Choose a reason for hiding this comment

bbondy left a comment

Choose a reason for hiding this comment

bbondy Jul 16, 2018

Choose a reason for hiding this comment

simonhong commented Jul 17, 2018

simonhong commented Jul 16, 2018 •

edited

Loading

simonhong commented Jul 16, 2018 •

edited

Loading

simonhong commented Jul 16, 2018 •

edited

Loading