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.

Sign up for GitHub

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

Jump to bottom

Fix #19069 - IsWebstoreUpdateUrl should return true for kChromeWebstoreUpdateURL even when component-updater switch is set (uplift to 1.32.x) #11134

Merged
merged 1 commit into from
Nov 19, 2021
Merged

Fix #19069 - IsWebstoreUpdateUrl should return true for kChromeWebstoreUpdateURL even when component-updater switch is set (uplift to 1.32.x) #11134

merged 1 commit into from
Nov 19, 2021

Conversation

bsclifton
Copy link
Member

@bsclifton bsclifton commented Nov 17, 2021 •
edited by kjozwiak
Loading

Manual uplift of #10781
Fixes brave/brave-browser#19069

Pre-approval checklist:

  • You have tested your change on Nightly.
  • This contains text which needs to be translated.
    • There are more than 7 days before the release.
    • I've notified folks in #l10n on Slack that translations are needed.
  • The PR milestones match the branch they are landing to.

Pre-merge checklist:

  • You have checked CI and the builds, lint, and tests all pass or are not related to your PR.

Post-merge checklist:

  • The associated issue milestone is set to the smallest version that the changes is landed on.

@jumde @bsclifton
Merge pull request #10781 from brave/extension_state_mismatch
6510f0a 
Fix #19069 - IsWebstoreUpdateUrl should return true for kChromeWebstoreUpdateURL even when component-updater switch is set
@bsclifton bsclifton added this to the 1.32.x - Release #2 milestone Nov 17, 2021
@bsclifton bsclifton requested a review from a team November 17, 2021 16:54
@bsclifton bsclifton requested a review from a team as a code owner November 17, 2021 16:54
@bsclifton bsclifton self-assigned this Nov 17, 2021
@bsclifton bsclifton removed the request for review from a team November 17, 2021 16:54
@kjozwiak
Copy link
Member

Restarting macOS due to init failing as per https://ci.brave.com/job/pr-brave-browser-extension_state_mismatch-1.32.x-macos/1/execution/node/116/log.

 ConnectionResetError: [Errno 54] Connection reset by peer
12:07:35  Error: Command 'vpython3 script/download_rust_deps.py' returned non-zero exit status 1 in /Users/jenkins/jenkins/workspace/pr-brave-browser-extension_state_mismatch-1.32.x-macos/src/brave
12:07:35  Downloading https://rust-pkg-brave-core.s3.brave.com/rust_deps_mac_0.1.8.gz Traceback (most recent call last):
12:07:35    File "script/download_rust_deps.py", line 193, in <module>
12:07:35      sys.exit(main())
12:07:35    File "script/download_rust_deps.py", line 171, in main
12:07:35      download_and_unpack_rust_deps(sys.platform)
12:07:35    File "script/download_rust_deps.py", line 62, in download_and_unpack_rust_deps
12:07:35      deps.DownloadAndUnpack(url, RUSTUP_PATH)
12:07:35    File "/Users/jenkins/jenkins/workspace/pr-brave-browser-extension_state_mismatch-1.32.x-macos/src/brave/script/deps.py", line 72, in DownloadAndUnpack
12:07:35      DownloadUrl(url, f)
12:07:35    File "/Users/jenkins/jenkins/workspace/pr-brave-browser-extension_state_mismatch-1.32.x-macos/src/brave/script/deps.py", line 38, in DownloadUrl
12:07:35      chunk = response.read(CHUNK_SIZE)
12:07:35    File "/Users/jenkins/jenkins/workspace/pr-brave-browser-extension_state_mismatch-1.32.x-macos/src/brave/vendor/depot_tools/[email protected]_bin/python3/lib/python3.8/http/client.py", line 455, in read
12:07:35      n = self.readinto(b)
12:07:35    File "/Users/jenkins/jenkins/workspace/pr-brave-browser-extension_state_mismatch-1.32.x-macos/src/brave/vendor/depot_tools/[email protected]_bin/python3/lib/python3.8/http/client.py", line 499, in readinto
12:07:35      n = self.fp.readinto(b)
12:07:35    File "/Users/jenkins/jenkins/workspace/pr-brave-browser-extension_state_mismatch-1.32.x-macos/src/brave/vendor/depot_tools/[email protected]_bin/python3/lib/python3.8/socket.py", line 669, in readinto
12:07:35      return self._sock.recv_into(b)
12:07:35    File "/Users/jenkins/jenkins/workspace/pr-brave-browser-extension_state_mismatch-1.32.x-macos/src/brave/vendor/depot_tools/[email protected]_bin/python3/lib/python3.8/ssl.py", line 1241, in recv_into
12:07:35      return self.read(nbytes, buffer)
12:07:35    File "/Users/jenkins/jenkins/workspace/pr-brave-browser-extension_state_mismatch-1.32.x-macos/src/brave/vendor/depot_tools/[email protected]_bin/python3/lib/python3.8/ssl.py", line 1099, in read
12:07:35      return self._sslobj.read(len, buffer)
12:07:35  ConnectionResetError: [Errno 54] Connection reset by peer

Restarting iOS due to an issue with GOMA_SERVER_HOST as per https://ci.brave.com/job/pr-brave-browser-extension_state_mismatch-1.32.x-ios/1/consoleFull#-1708487504bd4ef564-0a52-40a5-9c7b-d6464cc4c324

hudson.remoting.ProxyException: groovy.lang.MissingPropertyException: No such property: GOMA_SERVER_HOST for class: Script1
	at org.codehaus.groovy.runtime.ScriptBytecodeAdapter.unwrap(ScriptBytecodeAdapter.java:53)
	at org.codehaus.groovy.runtime.ScriptBytecodeAdapter.getProperty(ScriptBytecodeAdapter.java:458)
	at org.kohsuke.groovy.sandbox.impl.Checker$7.call(Checker.java:355)
	at org.kohsuke.groovy.sandbox.GroovyInterceptor.onGetProperty(GroovyInterceptor.java:68)
	at org.jenkinsci.plugins.scriptsecurity.sandbox.groovy.SandboxInterceptor.onGetProperty(SandboxInterceptor.java:355)
	at org.kohsuke.groovy.sandbox.impl.Checker$7.call(Checker.java:353)
	at org.kohsuke.groovy.sandbox.impl.Checker.checkedGetProperty(Checker.java:357)
	at com.cloudbees.groovy.cps.sandbox.SandboxInvoker.getProperty(SandboxInvoker.java:29)
	at com.cloudbees.groovy.cps.impl.PropertyAccessBlock.rawGet(PropertyAccessBlock.java:20)
	at Script1.config(Script1.groovy:301)
	at Script1.configPR(Script1.groovy:306)
	at WorkflowScript.run(WorkflowScript:143)
	at ___cps.transform___(Native Method)
	at com.cloudbees.groovy.cps.impl.PropertyishBlock$ContinuationImpl.get(PropertyishBlock.java:74)
	at com.cloudbees.groovy.cps.LValueBlock$GetAdapter.receive(LValueBlock.java:30)
	at com.cloudbees.groovy.cps.impl.PropertyishBlock$ContinuationImpl.fixName(PropertyishBlock.java:66)
	at jdk.internal.reflect.GeneratedMethodAccessor311.invoke(Unknown Source)
	at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.base/java.lang.reflect.Method.invoke(Method.java:566)
	at com.cloudbees.groovy.cps.impl.ContinuationPtr$ContinuationImpl.receive(ContinuationPtr.java:72)
	at com.cloudbees.groovy.cps.impl.ConstantBlock.eval(ConstantBlock.java:21)
	at com.cloudbees.groovy.cps.Next.step(Next.java:83)
	at com.cloudbees.groovy.cps.Continuable$1.call(Continuable.java:174)
	at com.cloudbees.groovy.cps.Continuable$1.call(Continuable.java:163)
	at org.codehaus.groovy.runtime.GroovyCategorySupport$ThreadCategoryInfo.use(GroovyCategorySupport.java:129)
	at org.codehaus.groovy.runtime.GroovyCategorySupport.use(GroovyCategorySupport.java:268)
	at com.cloudbees.groovy.cps.Continuable.run0(Continuable.java:163)
	at org.jenkinsci.plugins.workflow.cps.SandboxContinuable.access$001(SandboxContinuable.java:18)
	at org.jenkinsci.plugins.workflow.cps.SandboxContinuable.run0(SandboxContinuable.java:51)
	at org.jenkinsci.plugins.workflow.cps.CpsThread.runNextChunk(CpsThread.java:185)
	at org.jenkinsci.plugins.workflow.cps.CpsThreadGroup.run(CpsThreadGroup.java:402)
	at org.jenkinsci.plugins.workflow.cps.CpsThreadGroup.access$400(CpsThreadGroup.java:96)
	at org.jenkinsci.plugins.workflow.cps.CpsThreadGroup$2.call(CpsThreadGroup.java:314)
	at org.jenkinsci.plugins.workflow.cps.CpsThreadGroup$2.call(CpsThreadGroup.java:278)
	at org.jenkinsci.plugins.workflow.cps.CpsVmExecutorService$2.call(CpsVmExecutorService.java:67)
	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
	at hudson.remoting.SingleLaneExecutorService$1.run(SingleLaneExecutorService.java:139)
	at jenkins.util.ContextResettingExecutorService$1.run(ContextResettingExecutorService.java:28)
	at jenkins.security.ImpersonatingExecutorService$1.run(ImpersonatingExecutorService.java:68)
	at java.base/java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:515)
	at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
	at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)
	at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)
	at java.base/java.lang.Thread.run(Thread.java:834)
Finished: FAILURE

kjozwiak
kjozwiak approved these changes Nov 19, 2021
View reviewed changes
Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

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

Uplift into 1.32.x approved after deliberating with @brave/uplift-approvers. QA has verified the PR on Nightly as per #10781 (comment).

@kjozwiak kjozwiak merged commit ddd6a2d into 1.32.x Nov 19, 2021
@kjozwiak kjozwiak deleted the extension_state_mismatch-1.32.x branch November 19, 2021 05:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kjozwiak kjozwiak kjozwiak approved these changes

Assignees

@bsclifton bsclifton

Labels
None yet
Projects
None yet
Milestone
1.32.x - Release #2
Development

Successfully merging this pull request may close these issues.
3 participants
@bsclifton @kjozwiak @jumde