From c800c1c182b954a3863aa703f923e6ec9ef8aa64 Mon Sep 17 00:00:00 2001 From: Cosmin Sabou Date: Wed, 5 Sep 2018 09:02:19 +0300 Subject: [PATCH] Backed out changeset b5fbe33b954e (bug 1473786) for browser chrome failures on browser_all_files_referenced. --- browser/config/mozconfigs/macosx64/beta | 2 -- browser/config/mozconfigs/macosx64/nightly | 2 -- browser/config/mozconfigs/macosx64/release | 2 -- taskcluster/ci/build/macosx.yml | 2 +- 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/browser/config/mozconfigs/macosx64/beta b/browser/config/mozconfigs/macosx64/beta index 11b54ad546a5..bbd4cc189617 100644 --- a/browser/config/mozconfigs/macosx64/beta +++ b/browser/config/mozconfigs/macosx64/beta @@ -7,6 +7,4 @@ fi ac_add_options --enable-official-branding ac_add_options --enable-verify-mar -ac_add_options --enable-lto - . "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/macosx64/nightly b/browser/config/mozconfigs/macosx64/nightly index 4e6d00f27523..e75edbadaa60 100644 --- a/browser/config/mozconfigs/macosx64/nightly +++ b/browser/config/mozconfigs/macosx64/nightly @@ -9,8 +9,6 @@ if test `uname -s` != Linux; then ac_add_options --enable-dtrace fi -ac_add_options --enable-lto - ac_add_options --with-branding=browser/branding/nightly . "$topsrcdir/build/mozconfig.common.override" diff --git a/browser/config/mozconfigs/macosx64/release b/browser/config/mozconfigs/macosx64/release index 1c5c3f93752e..d0945af0cd33 100644 --- a/browser/config/mozconfigs/macosx64/release +++ b/browser/config/mozconfigs/macosx64/release @@ -10,8 +10,6 @@ fi ac_add_options --enable-official-branding ac_add_options --enable-verify-mar -ac_add_options --enable-lto - # safeguard against someone forgetting to re-set EARLY_BETA_OR_EARLIER in # defines.sh during the beta cycle export BUILDING_RELEASE=1 diff --git a/taskcluster/ci/build/macosx.yml b/taskcluster/ci/build/macosx.yml index 02b172cfc116..665cb18e78a6 100644 --- a/taskcluster/ci/build/macosx.yml +++ b/taskcluster/ci/build/macosx.yml @@ -49,7 +49,7 @@ macosx64/opt: tier: 1 worker-type: aws-provisioner-v1/gecko-{level}-b-linux worker: - max-run-time: 7200 + max-run-time: 3600 env: TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest" run: