From 5177b56699c55159aab29b52a9a1e6a13abfc2cb Mon Sep 17 00:00:00 2001 From: Brian Clifton Date: Tue, 26 Sep 2017 08:49:56 -0700 Subject: [PATCH] Update Muon to 4.4.25 (Chromium 61.0.3163.100) Auditors: @bbondy --- .gitignore | 1 + .npmrc | 4 ++-- tools/cibuild.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d5659f9f70e..f2ae62af55c 100644 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,7 @@ public/built .DS_Store .DS-Store temp.VisualElementsManifest.xml +app/extensions/gen/ # electron-packager output dirs *-darwin-x64 diff --git a/.npmrc b/.npmrc index 208dbfea9b0..1a439c7c713 100644 --- a/.npmrc +++ b/.npmrc @@ -1,7 +1,7 @@ runtime = electron target_arch = x64 -brave_electron_version = 4.4.20 +brave_electron_version = 4.4.25 chromedriver_version = 2.30 -target = v4.4.20 +target = v4.4.25 disturl=https://brave-laptop-binaries.s3.amazonaws.com/atom-shell/dist/ build_from_source = true diff --git a/tools/cibuild.py b/tools/cibuild.py index d1bd2e13b87..32793ea43a6 100755 --- a/tools/cibuild.py +++ b/tools/cibuild.py @@ -4,7 +4,7 @@ import subprocess import sys import os.path -MUON_VERSION = '4.4.20' +MUON_VERSION = '4.4.25' CHROMEDRIVER_VERSION = '2.30' SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__))) TARGET_ARCH= os.environ['TARGET_ARCH'] if os.environ.has_key('TARGET_ARCH') else 'x64'