Create zip in deb building script #6600

darkdh · 2020-09-09T01:46:09Z

brave-bin AUR package relies on zip to generate the package
https://aur.archlinux.org/cgit/aur.git/commit/?h=brave-bin&id=e70061fb7fb30f7a4bc35e108df96be404ec0a62
And we only contain libEGL.so and libGLESv2.so for linux installer(deb/rpm)
in chrome/installer/linux/BUILD.gn

This is the preview of what will be contained in zip

Archive:  brave-browser-nightly-1.16.8-linux-amd64.zip
  Length      Date    Time    Name
---------  ---------- -----   ----
   460496  2020-09-10 14:16   brave_100_percent.pak
    14394  2020-09-10 14:16   product_logo_128_nightly.png
  2025568  2020-09-10 14:16   crashpad_handler
        0  2020-09-10 14:16   resources/
        0  2020-09-10 14:16   resources/brave_extension/
        *  2020-09-08 11:16   resources/brave_extension/_locales/*
        0  2020-09-10 14:16   resources/brave_rewards/
        *  2020-09-08 11:16   resources/brave_rewards/_locales/*
    37394  2020-09-10 14:16   xdg-mime
  1464271  2020-09-10 14:16   chrome_200_percent.pak
        0  2020-09-10 14:16   swiftshader/
  2616536  2020-09-10 14:16   swiftshader/libGLESv2.so
   261760  2020-09-10 14:16   swiftshader/libEGL.so
        *  2020-09-10 14:16   locales/*
      576  2020-09-10 14:16   default-app-block
  9265904  2020-09-10 14:16   libGLESv2.so
179127032  2020-09-10 14:16   brave
  6073187  2020-09-10 14:16   resources.pak
     1832  2020-09-08 05:19   brave-browser
   171473  2020-09-10 14:16   v8_context_snapshot.bin
    16726  2020-09-10 14:16   LICENSE
   835781  2020-09-10 14:16   chrome_100_percent.pak
        0  2020-09-08 11:17   WidevineCdm/
      473  2020-09-01 18:29   WidevineCdm/LICENSE
        0  2020-09-08 11:17   WidevineCdm/_platform_specific/
        0  2020-09-08 11:17   WidevineCdm/_platform_specific/linux_x64/
        0  2019-11-26 17:01   WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
        2  2019-11-26 17:01   WidevineCdm/manifest.json
        0  2020-09-10 14:16   cron/
    15244  2020-09-10 14:16   cron/brave-browser-nightly
        0  2020-09-10 14:16   MEIPreload/
     7022  2020-09-10 14:16   MEIPreload/preloaded_data.pb
      228  2020-09-10 14:16   MEIPreload/manifest.json
   237152  2020-09-10 14:16   libEGL.so
     1832  2020-09-10 14:16   brave-browser-nightly
   228816  2020-09-10 14:16   chrome-sandbox
    33273  2020-09-10 14:16   xdg-settings
 10518160  2020-09-10 14:16   icudtl.dat
 10700764  2020-09-10 14:16   brave_resources.pak
   476590  2020-09-10 14:16   brave_200_percent.pak
---------                     -------
247435589                     305 files

Submitter Checklist:

Test Plan:

Grab the package (*-linux-x64.zip) on release page
Unzip it and make sure it has libEGL.so and libGLESv2.so
Launch brave from extracted folder
Go to brave://gpu
WebGL and OpenGL should not be disabled

Reviewer Checklist:

New files have MPL-2.0 license header.
Request a security/privacy review as needed.
Adequate test coverage exists to prevent regressions
Verify test plan is specified in PR before merging to source

After-merge Checklist:

The associated issue milestone is set to the smallest version that the
changes has landed on.
All relevant documentation has been updated.

bsclifton

Grabbed zip from PR builder (see https://bravesoftware.slack.com/archives/CMH8DU4TF/p1599619980074900 on Slack) and verified both libEGL.so and libGLESv2.so are included 😄 Nice work!

bsclifton · 2020-09-09T21:38:22Z

@bridiver if this looks good to you, we can merge and I can help create uplifts

antonok-edm

By my count, this is the full list of files files from the deb release that are not also included in the zip release. Are any of the others important? I suspect we probably want to at least be including the swiftshader directory as well.

./usr/share/menu/brave-browser.menu
./usr/share/gnome-control-center/default-apps/brave-browser.xml
./usr/share/doc/brave-browser/changelog.gz
./usr/share/appdata/brave-browser.appdata.xml
./usr/share/applications/brave-browser.desktop
./usr/share/man/man1/brave-browser-stable.1.gz
./opt/brave.com/brave/product_logo_32.xpm
./opt/brave.com/brave/product_logo_16.png
./opt/brave.com/brave/xdg-mime
./opt/brave.com/brave/product_logo_32.png
./opt/brave.com/brave/product_logo_256.png
./opt/brave.com/brave/swiftshader/libGLESv2.so
./opt/brave.com/brave/swiftshader/libEGL.so
./opt/brave.com/brave/WidevineCdm/LICENSE               # there is a file called LICENSE in the zip, not sure if it's the same though
./opt/brave.com/brave/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so
./opt/brave.com/brave/WidevineCdm/manifest.json
./opt/brave.com/brave/MEIPreload/preloaded_data.pb
./opt/brave.com/brave/MEIPreload/manifest.json
./opt/brave.com/brave/product_logo_64.png
./opt/brave.com/brave/crashpad_handler
./opt/brave.com/brave/product_logo_48.png
./opt/brave.com/brave/xdg-settings
./opt/brave.com/brave/default-app-block
./opt/brave.com/brave/libGLESv2.so                      # included by this PR
./opt/brave.com/brave/chrome-sandbox
./opt/brave.com/brave/libEGL.so                         # included by this PR
./opt/brave.com/brave/cron/brave-browser
./opt/brave.com/brave/brave-browser
./opt/brave.com/brave/product_logo_128.png
./opt/brave.com/brave/product_logo_24.png
./usr/bin/brave-browser-stable -> /opt/brave.com/brave/brave-browser
./usr/share/man/man1/brave-browser.1.gz -> brave-browser-stable.1.gz
./etc/cron.daily/brave-browser -> /opt/brave.com/brave/cron/brave-browser

darkdh · 2020-09-10T17:57:25Z

zip file will no longer be in dist folder, now it will reside in the same level as deb/rpm packages.
@bsclifton what process should we change so that we can automatically grab it and upload to release page?

bridiver · 2020-09-10T18:00:22Z

patches/chrome-installer-linux-debian-build.sh.patch

+   fi
+   log_cmd fakeroot dpkg-deb ${COMPRESSION_OPTS} -b "${STAGEDIR}" .
+   verify_package "$DEPENDS"
+  cd "${STAGEDIR}/${INSTALLDIR}/"


use ; or && to put this all on one line

bsclifton · 2020-09-10T23:09:37Z

zip file will no longer be in dist folder, now it will reside in the same level as deb/rpm packages.
@bsclifton what process should we change so that we can automatically grab it and upload to release page?

Addressed here 😄
https://github.com/brave/devops/pull/3620

darkdh · 2020-09-11T01:33:23Z

Known intermittent error of test-install:

18:23:27  powershell.exe : Start-Process : This command cannot be run due to the error: The system cannot find the file specified.
18:23:27  At C:\_zip@tmp\durable-c60fdcf6\powershellWrapper.ps1:3 char:1
18:23:27  + & powershell -NoProfile -NonInteractive -ExecutionPolicy Bypass -Comm ...
18:23:27  + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
18:23:27      + CategoryInfo          : NotSpecified: (Start-Process :...file specified.:String) [], RemoteException
18:23:27      + FullyQualifiedErrorId : NativeCommandError
18:23:27   
18:23:27  At C:\_zip@tmp\durable-c60fdcf6\powershellScript.ps1:10 char:17
18:23:27  + ...             Start-Process "C:\Users\Administrator\AppData\Local\Brave ...
18:23:27  +                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
18:23:27      + CategoryInfo          : InvalidOperation: (:) [Start-Process], InvalidOperationException
18:23:27      + FullyQualifiedErrorId : InvalidOperationException,Microsoft.PowerShell.Commands.StartProcessCommand

https://ci.brave.com/job/pr-brave-browser-create_dist_zip-windows/9/execution/node/241/log/

bsclifton · 2020-09-11T06:06:14Z

Blocked on https://github.com/brave/devops/pull/3620

mihaiplesa · 2020-09-11T15:56:17Z

Will this be uplifted all the way?

darkdh · 2020-09-11T21:23:51Z

ideally, this PR will be uplifted to release channel

bsclifton · 2020-09-14T20:05:53Z

@darkdh I think we can uplift this to 1.15 also 👍 If there is a conflict because of C85/C86, we can add it to #6195 (as what we need to uplift along with C86)

Create zip in deb building script

darkdh requested review from bridiver, bbondy and bsclifton September 9, 2020 01:46

darkdh self-assigned this Sep 9, 2020

bbondy approved these changes Sep 9, 2020

View reviewed changes

bsclifton approved these changes Sep 9, 2020

View reviewed changes

bsclifton added this to the 1.16.x - Nightly milestone Sep 9, 2020

antonok-edm reviewed Sep 10, 2020

View reviewed changes

bridiver reviewed Sep 10, 2020

View reviewed changes

darkdh force-pushed the create_dist_zip branch 3 times, most recently from ed8e5b0 to 1c396d6 Compare September 10, 2020 21:21

darkdh changed the title ~~Add missing binaries to packaging zip~~ Create zip in deb building script Sep 10, 2020

bridiver approved these changes Sep 10, 2020

View reviewed changes

darkdh force-pushed the create_dist_zip branch from 4c96516 to 09a1483 Compare September 10, 2020 22:27

bsclifton added the Uplift/Blocked label Sep 11, 2020

mihaiplesa added CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-windows labels Sep 11, 2020

darkdh requested a review from mihaiplesa as a code owner September 11, 2020 16:05

mihaiplesa removed CI/skip-android Do not run CI builds for Android CI/skip-ios Do not run CI builds for iOS CI/skip-macos-x64 Do not run CI builds for macOS x64 labels Sep 11, 2020

mihaiplesa added CI/skip Do not run CI builds (except noplatform) and removed CI/skip-windows labels Sep 11, 2020

darkdh added 3 commits September 11, 2020 17:00

Create zip in deb building script

3b0be18

Cleanup exising patches

aee9231

Cleanup installer.include patch

4df7914

darkdh force-pushed the create_dist_zip branch from 9fabf56 to 4df7914 Compare September 12, 2020 00:03

darkdh removed the CI/skip Do not run CI builds (except noplatform) label Sep 12, 2020

mihaiplesa approved these changes Sep 14, 2020

View reviewed changes

mihaiplesa removed the Uplift/Blocked label Sep 14, 2020

darkdh merged commit ad5c797 into master Sep 14, 2020

darkdh deleted the create_dist_zip branch September 14, 2020 18:45

mkarolin pushed a commit that referenced this pull request Sep 21, 2020

Merge pull request #6600 from brave/create_dist_zip

4d0e87d

Create zip in deb building script

mkarolin mentioned this pull request Sep 21, 2020

Upgrade from Chromium 85 to Chromium 86 (1.15.x). #6677

Merged

32 tasks

btlechowski mentioned this pull request Sep 24, 2020

[Desktop] WebGL & OpenGL has been disabled in stable 1.13.82 and beta 1.14.65 brave/brave-browser#11504

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Create zip in deb building script #6600

Create zip in deb building script #6600

darkdh commented Sep 9, 2020 •

edited

Loading

bsclifton left a comment

bsclifton commented Sep 9, 2020

antonok-edm left a comment

darkdh commented Sep 10, 2020

bridiver Sep 10, 2020

darkdh Sep 10, 2020

bsclifton commented Sep 10, 2020

darkdh commented Sep 11, 2020

bsclifton commented Sep 11, 2020

mihaiplesa commented Sep 11, 2020

darkdh commented Sep 11, 2020

bsclifton commented Sep 14, 2020 •

edited

Loading

Create zip in deb building script #6600

Create zip in deb building script #6600

Conversation

darkdh commented Sep 9, 2020 • edited Loading

Submitter Checklist:

Test Plan:

Reviewer Checklist:

After-merge Checklist:

bsclifton left a comment

Choose a reason for hiding this comment

bsclifton commented Sep 9, 2020

antonok-edm left a comment

Choose a reason for hiding this comment

darkdh commented Sep 10, 2020

bridiver Sep 10, 2020

Choose a reason for hiding this comment

darkdh Sep 10, 2020

Choose a reason for hiding this comment

bsclifton commented Sep 10, 2020

darkdh commented Sep 11, 2020

bsclifton commented Sep 11, 2020

mihaiplesa commented Sep 11, 2020

darkdh commented Sep 11, 2020

bsclifton commented Sep 14, 2020 • edited Loading

darkdh commented Sep 9, 2020 •

edited

Loading

bsclifton commented Sep 14, 2020 •

edited

Loading