Skip to content

/ brave-browser

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

Pr9115 android signing uplift 1.7.x #9116

Merged
merged 1 commit into from Apr 13, 2020
Merged

Pr9115 android signing uplift 1.7.x #9116

merged 1 commit into from Apr 13, 2020

Conversation

@SergeyZhukovsky
Copy link
Member

SergeyZhukovsky commented Apr 9, 2020

Submitter Checklist:

Uplift for #9115

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.

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.
@SergeyZhukovsky SergeyZhukovsky added this to the 1.7.x - Release milestone Apr 9, 2020
@SergeyZhukovsky SergeyZhukovsky requested a review from brave/uplift-approvers Apr 9, 2020
@SergeyZhukovsky SergeyZhukovsky requested a review from bridiver as a code owner Apr 9, 2020
@SergeyZhukovsky SergeyZhukovsky self-assigned this Apr 9, 2020
@SergeyZhukovsky SergeyZhukovsky changed the base branch from master to 1.7.x Apr 9, 2020
@kjozwiak
Copy link
Member

kjozwiak commented Apr 9, 2020

Restarting Android as build failed as per https://ci.brave.com/job/brave-browser-build-pr/job/PR-9116/1/execution/node/279/log/:

14:11:49  ERROR at //build/timestamp.gni:31:19: Script returned non-zero exit code.
14:11:49  build_timestamp = exec_script(compute_build_timestamp,
14:11:49                    ^----------
14:11:49  Current dir: /home/ubuntu/jenkins/workspace/brave-browser-build-pr_PR-9116/src/out/android_Release_arm/
14:11:49  Command: python /home/ubuntu/jenkins/workspace/brave-browser-build-pr_PR-9116/src/build/compute_build_timestamp.py official
14:11:49  Returned 1.
14:11:49  stderr:
14:11:49  
14:11:49  Traceback (most recent call last):
14:11:49    File "/home/ubuntu/jenkins/workspace/brave-browser-build-pr_PR-9116/src/build/compute_build_timestamp.py", line 127, in <module>
14:11:49      sys.exit(main())
14:11:49    File "/home/ubuntu/jenkins/workspace/brave-browser-build-pr_PR-9116/src/build/compute_build_timestamp.py", line 113, in main
14:11:49      last_commit_timestamp = int(open(lastchange_file).read())
14:11:49  IOError: [Errno 2] No such file or directory: '/home/ubuntu/jenkins/workspace/brave-browser-build-pr_PR-9116/src/build/util/LASTCHANGE.committime'
14:11:49  
14:11:49  See //base/BUILD.gn:34:1: whence it was imported.
14:11:49  import("//build/timestamp.gni")
14:11:49  ^-----------------------------
14:11:49  See //BUILD.gn:318:7: which caused the file to be included.
14:11:49        "//base:base_junit_tests",
14:11:49        ^------------------------

Restarting iOS as init failed as per https://ci.brave.com/job/brave-browser-build-pr/job/PR-9116/1/execution/node/156/log/.

Restarting Linux as build failed as per https://ci.brave.com/job/brave-browser-build-pr/job/PR-9116/1/execution/node/335/log/:

14:12:41  ERROR at //build/config/sysroot.gni:57:5: Assertion failed.
14:12:41      assert(
14:12:41      ^-----
14:12:41  Missing sysroot (//build/linux/debian_sid_amd64-sysroot). To fix, run: build/linux/sysroot_scripts/install-sysroot.py --arch=amd64
14:12:41  See //build/config/sysroot.gni:58:9: 
14:12:41          exec_script("//build/dir_exists.py",
14:12:41          ^-----------------------------------
14:12:41  This is where it was set.
14:12:41  See //chrome/installer/BUILD.gn:7:1: whence it was imported.
14:12:41  import("//build/config/sysroot.gni")
14:12:41  ^----------------------------------
14:12:41  See //BUILD.gn:71:5: which caused the file to be included.
14:12:41      "//chrome/installer",

Restarting macOS as build failed as per https://ci.brave.com/job/brave-browser-build-pr/job/PR-9116/1/execution/node/507/log/:

14:27:25  ERROR at //build/timestamp.gni:31:19: Script returned non-zero exit code.
14:27:25  build_timestamp = exec_script(compute_build_timestamp,
14:27:25                    ^----------
14:27:25  Current dir: /Users/jenkins/jenkins/workspace/brave-browser-build-pr_PR-9116/src/out/Release/
14:27:25  Command: python /Users/jenkins/jenkins/workspace/brave-browser-build-pr_PR-9116/src/build/compute_build_timestamp.py official
14:27:25  Returned 1.
14:27:25  stderr:
14:27:25  
14:27:25  Traceback (most recent call last):
14:27:25    File "/Users/jenkins/jenkins/workspace/brave-browser-build-pr_PR-9116/src/build/compute_build_timestamp.py", line 127, in <module>
14:27:25      sys.exit(main())
14:27:25    File "/Users/jenkins/jenkins/workspace/brave-browser-build-pr_PR-9116/src/build/compute_build_timestamp.py", line 113, in main
14:27:25      last_commit_timestamp = int(open(lastchange_file).read())
14:27:25  IOError: [Errno 2] No such file or directory: '/Users/jenkins/jenkins/workspace/brave-browser-build-pr_PR-9116/src/build/util/LASTCHANGE.committime'
14:27:25  
14:27:25  See //base/BUILD.gn:34:1: whence it was imported.
14:27:25  import("//build/timestamp.gni")
14:27:25  ^-----------------------------
14:27:25  See //BUILD.gn:68:5: which caused the file to be included.
14:27:25      "//base:base_perftests",
14:27:25      ^----------------------

Restarting Win as build failed as per https://ci.brave.com/job/brave-browser-build-pr/job/PR-9116/1/execution/node/395/log/:

14:19:59  Traceback (most recent call last):
14:19:59  
14:19:59    File "C:/.7.x/src/build/compute_build_timestamp.py", line 127, in <module>
14:19:59  
14:19:59      
14:19:59  sys.exit(main())
14:19:59  
14:19:59    File "C:/.7.x/src/build/compute_build_timestamp.py", line 113, in main
14:19:59  
14:19:59  
14:19:59      
14:19:59  last_commit_timestamp = int(open(lastchange_file).read())
14:19:59  
14:19:59  IOErro
14:19:59  r: [Errno 2] No such file or directory: 'C:\\.7.x\\src\\build\\util\\LASTCHANGE.committime'
14:19:59  
14:19:59  ERROR at //build/timestamp.gni:31:19: Script returned non-zero exit code.
14:19:59  build_timestamp = exec_script(compute_build_timestamp,
14:19:59                    ^----------
14:19:59  Current dir: C:/.7.x/src/out/Release/
14:19:59  Command: C:/.7.x/vendor/depot_tools/bootstrap-3_8_0_chromium_8_bin/python/bin/python.exe C:/.7.x/src/build/compute_build_timestamp.py official
14:19:59  Returned 1.
14:19:59  See //base/BUILD.gn:34:1: whence it was imported.
14:19:59  import("//build/timestamp.gni")
14:19:59  ^-----------------------------
14:19:59  See //BUILD.gn:69:5: which caused the file to be included.
14:19:59      "//base:base_unittests",
14:19:59      ^----------------------
@bridiver
Copy link
Collaborator

bridiver commented Apr 9, 2020

cc @mihaiplesa - I believe this should be fixed by https://github.com/brave/brave-browser/pull/9112/files
@bridiver
Copy link
Collaborator

bridiver commented Apr 9, 2020

actually it looks like it's still a problem without depth=2 cc @linhkikuchi
@bsclifton
Copy link
Member

bsclifton commented Apr 11, 2020

Moving to 1.7.x Hotfix 1 milestone; let's not merge until after the 1.7 release 😄
@SergeyZhukovsky
Copy link
Member Author

SergeyZhukovsky commented Apr 11, 2020

Moving back to 1.7.x as per DM discussion. Android builds are blocked without that.
@bsclifton
bsclifton reviewed Apr 13, 2020
View changes
Copy link
Member

bsclifton left a comment

++ LGTM
@bsclifton bsclifton force-pushed the pr9115_android_signing_uplift_1.7.x branch from 168442a to 837180e Apr 13, 2020
@bsclifton
Copy link
Member

bsclifton commented Apr 13, 2020

I'm seeing an error here during the build step
https://ci.brave.com/job/brave-browser-build-pr/job/PR-9116/3/execution/node/234/log/

Since this is critical for Android, I'm going to replay the CI for Android only to make sure it works. Rebased after merging #9156 - it should restart in a minute here
@bridiver
bridiver reviewed Apr 13, 2020
View changes
lib/createDist.js
@@ -19,6 +19,9 @@ const createDist = (buildConfig = config.defaultBuildConfig, options) => {
fs.removeSync(path.join(config.outputDir, 'dist'))
config.buildTarget = 'create_dist'
util.buildTarget()
if (config.targetOS === 'android') {

This comment has been minimized.

Sign in to view
Copy link
@bridiver

bridiver Apr 13, 2020

Collaborator

this should still have config.shouldSign() in addition to the targetOS check

This comment has been minimized.

Sign in to view
Copy link
@SergeyZhukovsky

SergeyZhukovsky Apr 13, 2020

Author Member

we can add it as a follow up, as should be applied in any case on all 3 branches. But I think we shouldn't skip signing Android apks. First it's fast, second we will need that on tests to check upgrade scenarios.
@SergeyZhukovsky @bsclifton
move apks signing on Android to create_dist
Loading status checks…
69a5376
@bsclifton bsclifton force-pushed the pr9115_android_signing_uplift_1.7.x branch from 837180e to 69a5376 Apr 13, 2020
@bsclifton
bsclifton approved these changes Apr 13, 2020
View changes
Copy link
Member

bsclifton left a comment

++
@bsclifton bsclifton merged commit 9c05338 into 1.7.x Apr 13, 2020
2 checks passed
2 checks passed
SonarCloud Code Analysis Quality Gate passed
Details
continuous-integration/jenkins/pr-head This commit looks good
Details
@bsclifton bsclifton deleted the pr9115_android_signing_uplift_1.7.x branch Apr 13, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bridiver bridiver

@bsclifton bsclifton

Assignees

@SergeyZhukovsky SergeyZhukovsky

Labels
CI/skip-ios CI/skip-linux CI/skip-macos CI/skip-windows
Projects
None yet
Milestone
  1.7.x - Release
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
@SergeyZhukovsky @kjozwiak @bridiver @bsclifton
You can’t perform that action at this time.