зеркало из https://github.com/mozilla/gecko-dev.git
Merge mozilla-central to mozilla-inbound. a=merge CLOSED TREE
--HG-- rename : browser/extensions/asan-reporter/bootstrap.js => browser/modules/AsanReporter.jsm extra : rebase_source : 25955f7422014cdf3156daa8ea34537c2ecb9355
This commit is contained in:
Bogdan Tara
Коммит
4b0cf7ed45
|
|
@ -367,6 +367,9 @@ add_task(async function test_doorhanger_new_window() {
|
|||
useAddonManager: "temporary",
|
||||
});
|
||||
let ext2 = ExtensionTestUtils.loadExtension({
|
||||
background() {
|
||||
browser.test.sendMessage("url", browser.runtime.getURL("ext2.html"));
|
||||
},
|
||||
manifest: {
|
||||
chrome_settings_overrides: {homepage: "ext2.html"},
|
||||
name: "Ext2",
|
||||
|
|
@ -377,13 +380,13 @@ add_task(async function test_doorhanger_new_window() {
|
|||
|
||||
await ext1.startup();
|
||||
await ext2.startup();
|
||||
let url = await ext2.awaitMessage("url");
|
||||
|
||||
await SpecialPowers.pushPrefEnv({set: [["browser.startup.page", 1]]});
|
||||
|
||||
let windowOpenedPromise = BrowserTestUtils.waitForNewWindow();
|
||||
let windowOpenedPromise = BrowserTestUtils.waitForNewWindow({url});
|
||||
let win = OpenBrowserWindow();
|
||||
await windowOpenedPromise;
|
||||
await BrowserTestUtils.browserLoaded(win.gBrowser.selectedBrowser);
|
||||
let doc = win.document;
|
||||
let description = doc.getElementById("extension-homepage-notification-description");
|
||||
let panel = doc.getElementById("extension-notification-panel");
|
||||
|
|
|
|||
|
|
@ -1523,6 +1523,11 @@ BrowserGlue.prototype = {
|
|||
UnsubmittedCrashHandler.scheduleCheckForUnsubmittedCrashReports();
|
||||
}
|
||||
|
||||
if (AppConstants.ASAN_REPORTER) {
|
||||
ChromeUtils.import("resource:///modules/AsanReporter.jsm");
|
||||
AsanReporter.init();
|
||||
}
|
||||
|
||||
if (AppConstants.platform == "win") {
|
||||
Services.tm.idleDispatchToMainThread(() => {
|
||||
// For Windows 7, initialize the jump list module.
|
||||
|
|
|
|||
|
|
@ -1,373 +0,0 @@
|
|||
Mozilla Public License Version 2.0
|
||||
==================================
|
||||
|
||||
1. Definitions
|
||||
--------------
|
||||
|
||||
1.1. "Contributor"
|
||||
means each individual or legal entity that creates, contributes to
|
||||
the creation of, or owns Covered Software.
|
||||
|
||||
1.2. "Contributor Version"
|
||||
means the combination of the Contributions of others (if any) used
|
||||
by a Contributor and that particular Contributor's Contribution.
|
||||
|
||||
1.3. "Contribution"
|
||||
means Covered Software of a particular Contributor.
|
||||
|
||||
1.4. "Covered Software"
|
||||
means Source Code Form to which the initial Contributor has attached
|
||||
the notice in Exhibit A, the Executable Form of such Source Code
|
||||
Form, and Modifications of such Source Code Form, in each case
|
||||
including portions thereof.
|
||||
|
||||
1.5. "Incompatible With Secondary Licenses"
|
||||
means
|
||||
|
||||
(a) that the initial Contributor has attached the notice described
|
||||
in Exhibit B to the Covered Software; or
|
||||
|
||||
(b) that the Covered Software was made available under the terms of
|
||||
version 1.1 or earlier of the License, but not also under the
|
||||
terms of a Secondary License.
|
||||
|
||||
1.6. "Executable Form"
|
||||
means any form of the work other than Source Code Form.
|
||||
|
||||
1.7. "Larger Work"
|
||||
means a work that combines Covered Software with other material, in
|
||||
a separate file or files, that is not Covered Software.
|
||||
|
||||
1.8. "License"
|
||||
means this document.
|
||||
|
||||
1.9. "Licensable"
|
||||
means having the right to grant, to the maximum extent possible,
|
||||
whether at the time of the initial grant or subsequently, any and
|
||||
all of the rights conveyed by this License.
|
||||
|
||||
1.10. "Modifications"
|
||||
means any of the following:
|
||||
|
||||
(a) any file in Source Code Form that results from an addition to,
|
||||
deletion from, or modification of the contents of Covered
|
||||
Software; or
|
||||
|
||||
(b) any new file in Source Code Form that contains any Covered
|
||||
Software.
|
||||
|
||||
1.11. "Patent Claims" of a Contributor
|
||||
means any patent claim(s), including without limitation, method,
|
||||
process, and apparatus claims, in any patent Licensable by such
|
||||
Contributor that would be infringed, but for the grant of the
|
||||
License, by the making, using, selling, offering for sale, having
|
||||
made, import, or transfer of either its Contributions or its
|
||||
Contributor Version.
|
||||
|
||||
1.12. "Secondary License"
|
||||
means either the GNU General Public License, Version 2.0, the GNU
|
||||
Lesser General Public License, Version 2.1, the GNU Affero General
|
||||
Public License, Version 3.0, or any later versions of those
|
||||
licenses.
|
||||
|
||||
1.13. "Source Code Form"
|
||||
means the form of the work preferred for making modifications.
|
||||
|
||||
1.14. "You" (or "Your")
|
||||
means an individual or a legal entity exercising rights under this
|
||||
License. For legal entities, "You" includes any entity that
|
||||
controls, is controlled by, or is under common control with You. For
|
||||
purposes of this definition, "control" means (a) the power, direct
|
||||
or indirect, to cause the direction or management of such entity,
|
||||
whether by contract or otherwise, or (b) ownership of more than
|
||||
fifty percent (50%) of the outstanding shares or beneficial
|
||||
ownership of such entity.
|
||||
|
||||
2. License Grants and Conditions
|
||||
--------------------------------
|
||||
|
||||
2.1. Grants
|
||||
|
||||
Each Contributor hereby grants You a world-wide, royalty-free,
|
||||
non-exclusive license:
|
||||
|
||||
(a) under intellectual property rights (other than patent or trademark)
|
||||
Licensable by such Contributor to use, reproduce, make available,
|
||||
modify, display, perform, distribute, and otherwise exploit its
|
||||
Contributions, either on an unmodified basis, with Modifications, or
|
||||
as part of a Larger Work; and
|
||||
|
||||
(b) under Patent Claims of such Contributor to make, use, sell, offer
|
||||
for sale, have made, import, and otherwise transfer either its
|
||||
Contributions or its Contributor Version.
|
||||
|
||||
2.2. Effective Date
|
||||
|
||||
The licenses granted in Section 2.1 with respect to any Contribution
|
||||
become effective for each Contribution on the date the Contributor first
|
||||
distributes such Contribution.
|
||||
|
||||
2.3. Limitations on Grant Scope
|
||||
|
||||
The licenses granted in this Section 2 are the only rights granted under
|
||||
this License. No additional rights or licenses will be implied from the
|
||||
distribution or licensing of Covered Software under this License.
|
||||
Notwithstanding Section 2.1(b) above, no patent license is granted by a
|
||||
Contributor:
|
||||
|
||||
(a) for any code that a Contributor has removed from Covered Software;
|
||||
or
|
||||
|
||||
(b) for infringements caused by: (i) Your and any other third party's
|
||||
modifications of Covered Software, or (ii) the combination of its
|
||||
Contributions with other software (except as part of its Contributor
|
||||
Version); or
|
||||
|
||||
(c) under Patent Claims infringed by Covered Software in the absence of
|
||||
its Contributions.
|
||||
|
||||
This License does not grant any rights in the trademarks, service marks,
|
||||
or logos of any Contributor (except as may be necessary to comply with
|
||||
the notice requirements in Section 3.4).
|
||||
|
||||
2.4. Subsequent Licenses
|
||||
|
||||
No Contributor makes additional grants as a result of Your choice to
|
||||
distribute the Covered Software under a subsequent version of this
|
||||
License (see Section 10.2) or under the terms of a Secondary License (if
|
||||
permitted under the terms of Section 3.3).
|
||||
|
||||
2.5. Representation
|
||||
|
||||
Each Contributor represents that the Contributor believes its
|
||||
Contributions are its original creation(s) or it has sufficient rights
|
||||
to grant the rights to its Contributions conveyed by this License.
|
||||
|
||||
2.6. Fair Use
|
||||
|
||||
This License is not intended to limit any rights You have under
|
||||
applicable copyright doctrines of fair use, fair dealing, or other
|
||||
equivalents.
|
||||
|
||||
2.7. Conditions
|
||||
|
||||
Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
|
||||
in Section 2.1.
|
||||
|
||||
3. Responsibilities
|
||||
-------------------
|
||||
|
||||
3.1. Distribution of Source Form
|
||||
|
||||
All distribution of Covered Software in Source Code Form, including any
|
||||
Modifications that You create or to which You contribute, must be under
|
||||
the terms of this License. You must inform recipients that the Source
|
||||
Code Form of the Covered Software is governed by the terms of this
|
||||
License, and how they can obtain a copy of this License. You may not
|
||||
attempt to alter or restrict the recipients' rights in the Source Code
|
||||
Form.
|
||||
|
||||
3.2. Distribution of Executable Form
|
||||
|
||||
If You distribute Covered Software in Executable Form then:
|
||||
|
||||
(a) such Covered Software must also be made available in Source Code
|
||||
Form, as described in Section 3.1, and You must inform recipients of
|
||||
the Executable Form how they can obtain a copy of such Source Code
|
||||
Form by reasonable means in a timely manner, at a charge no more
|
||||
than the cost of distribution to the recipient; and
|
||||
|
||||
(b) You may distribute such Executable Form under the terms of this
|
||||
License, or sublicense it under different terms, provided that the
|
||||
license for the Executable Form does not attempt to limit or alter
|
||||
the recipients' rights in the Source Code Form under this License.
|
||||
|
||||
3.3. Distribution of a Larger Work
|
||||
|
||||
You may create and distribute a Larger Work under terms of Your choice,
|
||||
provided that You also comply with the requirements of this License for
|
||||
the Covered Software. If the Larger Work is a combination of Covered
|
||||
Software with a work governed by one or more Secondary Licenses, and the
|
||||
Covered Software is not Incompatible With Secondary Licenses, this
|
||||
License permits You to additionally distribute such Covered Software
|
||||
under the terms of such Secondary License(s), so that the recipient of
|
||||
the Larger Work may, at their option, further distribute the Covered
|
||||
Software under the terms of either this License or such Secondary
|
||||
License(s).
|
||||
|
||||
3.4. Notices
|
||||
|
||||
You may not remove or alter the substance of any license notices
|
||||
(including copyright notices, patent notices, disclaimers of warranty,
|
||||
or limitations of liability) contained within the Source Code Form of
|
||||
the Covered Software, except that You may alter any license notices to
|
||||
the extent required to remedy known factual inaccuracies.
|
||||
|
||||
3.5. Application of Additional Terms
|
||||
|
||||
You may choose to offer, and to charge a fee for, warranty, support,
|
||||
indemnity or liability obligations to one or more recipients of Covered
|
||||
Software. However, You may do so only on Your own behalf, and not on
|
||||
behalf of any Contributor. You must make it absolutely clear that any
|
||||
such warranty, support, indemnity, or liability obligation is offered by
|
||||
You alone, and You hereby agree to indemnify every Contributor for any
|
||||
liability incurred by such Contributor as a result of warranty, support,
|
||||
indemnity or liability terms You offer. You may include additional
|
||||
disclaimers of warranty and limitations of liability specific to any
|
||||
jurisdiction.
|
||||
|
||||
4. Inability to Comply Due to Statute or Regulation
|
||||
---------------------------------------------------
|
||||
|
||||
If it is impossible for You to comply with any of the terms of this
|
||||
License with respect to some or all of the Covered Software due to
|
||||
statute, judicial order, or regulation then You must: (a) comply with
|
||||
the terms of this License to the maximum extent possible; and (b)
|
||||
describe the limitations and the code they affect. Such description must
|
||||
be placed in a text file included with all distributions of the Covered
|
||||
Software under this License. Except to the extent prohibited by statute
|
||||
or regulation, such description must be sufficiently detailed for a
|
||||
recipient of ordinary skill to be able to understand it.
|
||||
|
||||
5. Termination
|
||||
--------------
|
||||
|
||||
5.1. The rights granted under this License will terminate automatically
|
||||
if You fail to comply with any of its terms. However, if You become
|
||||
compliant, then the rights granted under this License from a particular
|
||||
Contributor are reinstated (a) provisionally, unless and until such
|
||||
Contributor explicitly and finally terminates Your grants, and (b) on an
|
||||
ongoing basis, if such Contributor fails to notify You of the
|
||||
non-compliance by some reasonable means prior to 60 days after You have
|
||||
come back into compliance. Moreover, Your grants from a particular
|
||||
Contributor are reinstated on an ongoing basis if such Contributor
|
||||
notifies You of the non-compliance by some reasonable means, this is the
|
||||
first time You have received notice of non-compliance with this License
|
||||
from such Contributor, and You become compliant prior to 30 days after
|
||||
Your receipt of the notice.
|
||||
|
||||
5.2. If You initiate litigation against any entity by asserting a patent
|
||||
infringement claim (excluding declaratory judgment actions,
|
||||
counter-claims, and cross-claims) alleging that a Contributor Version
|
||||
directly or indirectly infringes any patent, then the rights granted to
|
||||
You by any and all Contributors for the Covered Software under Section
|
||||
2.1 of this License shall terminate.
|
||||
|
||||
5.3. In the event of termination under Sections 5.1 or 5.2 above, all
|
||||
end user license agreements (excluding distributors and resellers) which
|
||||
have been validly granted by You or Your distributors under this License
|
||||
prior to termination shall survive termination.
|
||||
|
||||
************************************************************************
|
||||
* *
|
||||
* 6. Disclaimer of Warranty *
|
||||
* ------------------------- *
|
||||
* *
|
||||
* Covered Software is provided under this License on an "as is" *
|
||||
* basis, without warranty of any kind, either expressed, implied, or *
|
||||
* statutory, including, without limitation, warranties that the *
|
||||
* Covered Software is free of defects, merchantable, fit for a *
|
||||
* particular purpose or non-infringing. The entire risk as to the *
|
||||
* quality and performance of the Covered Software is with You. *
|
||||
* Should any Covered Software prove defective in any respect, You *
|
||||
* (not any Contributor) assume the cost of any necessary servicing, *
|
||||
* repair, or correction. This disclaimer of warranty constitutes an *
|
||||
* essential part of this License. No use of any Covered Software is *
|
||||
* authorized under this License except under this disclaimer. *
|
||||
* *
|
||||
************************************************************************
|
||||
|
||||
************************************************************************
|
||||
* *
|
||||
* 7. Limitation of Liability *
|
||||
* -------------------------- *
|
||||
* *
|
||||
* Under no circumstances and under no legal theory, whether tort *
|
||||
* (including negligence), contract, or otherwise, shall any *
|
||||
* Contributor, or anyone who distributes Covered Software as *
|
||||
* permitted above, be liable to You for any direct, indirect, *
|
||||
* special, incidental, or consequential damages of any character *
|
||||
* including, without limitation, damages for lost profits, loss of *
|
||||
* goodwill, work stoppage, computer failure or malfunction, or any *
|
||||
* and all other commercial damages or losses, even if such party *
|
||||
* shall have been informed of the possibility of such damages. This *
|
||||
* limitation of liability shall not apply to liability for death or *
|
||||
* personal injury resulting from such party's negligence to the *
|
||||
* extent applicable law prohibits such limitation. Some *
|
||||
* jurisdictions do not allow the exclusion or limitation of *
|
||||
* incidental or consequential damages, so this exclusion and *
|
||||
* limitation may not apply to You. *
|
||||
* *
|
||||
************************************************************************
|
||||
|
||||
8. Litigation
|
||||
-------------
|
||||
|
||||
Any litigation relating to this License may be brought only in the
|
||||
courts of a jurisdiction where the defendant maintains its principal
|
||||
place of business and such litigation shall be governed by laws of that
|
||||
jurisdiction, without reference to its conflict-of-law provisions.
|
||||
Nothing in this Section shall prevent a party's ability to bring
|
||||
cross-claims or counter-claims.
|
||||
|
||||
9. Miscellaneous
|
||||
----------------
|
||||
|
||||
This License represents the complete agreement concerning the subject
|
||||
matter hereof. If any provision of this License is held to be
|
||||
unenforceable, such provision shall be reformed only to the extent
|
||||
necessary to make it enforceable. Any law or regulation which provides
|
||||
that the language of a contract shall be construed against the drafter
|
||||
shall not be used to construe this License against a Contributor.
|
||||
|
||||
10. Versions of the License
|
||||
---------------------------
|
||||
|
||||
10.1. New Versions
|
||||
|
||||
Mozilla Foundation is the license steward. Except as provided in Section
|
||||
10.3, no one other than the license steward has the right to modify or
|
||||
publish new versions of this License. Each version will be given a
|
||||
distinguishing version number.
|
||||
|
||||
10.2. Effect of New Versions
|
||||
|
||||
You may distribute the Covered Software under the terms of the version
|
||||
of the License under which You originally received the Covered Software,
|
||||
or under the terms of any subsequent version published by the license
|
||||
steward.
|
||||
|
||||
10.3. Modified Versions
|
||||
|
||||
If you create software not governed by this License, and you want to
|
||||
create a new license for such software, you may create and use a
|
||||
modified version of this License if you rename the license and remove
|
||||
any references to the name of the license steward (except to note that
|
||||
such modified license differs from this License).
|
||||
|
||||
10.4. Distributing Source Code Form that is Incompatible With Secondary
|
||||
Licenses
|
||||
|
||||
If You choose to distribute Source Code Form that is Incompatible With
|
||||
Secondary Licenses under the terms of this version of the License, the
|
||||
notice described in Exhibit B of this License must be attached.
|
||||
|
||||
Exhibit A - Source Code Form License Notice
|
||||
-------------------------------------------
|
||||
|
||||
This Source Code Form is subject to the terms of the Mozilla Public
|
||||
License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
If it is not possible or desirable to put the notice in a particular
|
||||
file, then You may include the notice in a location (such as a LICENSE
|
||||
file in a relevant directory) where a recipient would be likely to look
|
||||
for such a notice.
|
||||
|
||||
You may add additional accurate notices of copyright ownership.
|
||||
|
||||
Exhibit B - "Incompatible With Secondary Licenses" Notice
|
||||
---------------------------------------------------------
|
||||
|
||||
This Source Code Form is "Incompatible With Secondary Licenses", as
|
||||
defined by the Mozilla Public License, v. 2.0.
|
||||
|
|
@ -1,52 +0,0 @@
|
|||
# firefox-asan-reporter
|
||||
|
||||
The ASan reporter addon for Firefox is an internal addon used in conjunction
|
||||
with special ASan (AddressSanitizer) builds of Firefox Nightly. Its main purpose
|
||||
is to scan for ASan crash report files on startup and submit them back to our
|
||||
crash handling infrastructure. Due to the way AddressSanitizer produces its
|
||||
crash information, it would be challenging (if possible at all), to get it
|
||||
working with our regular crash reporter.
|
||||
|
||||
The addon is only enabled in builds with the --enable-address-sanitizer-reporter
|
||||
flag set at build time. Currently, we don't produce such builds, but this might
|
||||
change once we decide to hand out Firefox+ASan Nightly builds as part of a
|
||||
special opt-in program.
|
||||
|
||||
## Prefs
|
||||
|
||||
### asanreporter.apiurl
|
||||
|
||||
The URL to the server receiving the crash information.
|
||||
|
||||
### asanreporter.clientid
|
||||
|
||||
The client id to send along with the crash information. By default, this is
|
||||
empty. If the user wishes, they can set this pref to e.g. an email address to
|
||||
allow us to contact them.
|
||||
|
||||
### asanreporter.authtoken
|
||||
|
||||
This is an authorization token that can be used in test setups with a non-public
|
||||
API endpoint that requires authentication. In the final setup, this pref remains
|
||||
empty.
|
||||
|
||||
### asanreporter.loglevel
|
||||
|
||||
This optional variable can be used to change the default logging level. The
|
||||
reporter addon uses Log.jsm which defines the following values for different
|
||||
levels of logging:
|
||||
|
||||
| Level Name | Value |
|
||||
| ---------- | ----- |
|
||||
| ALL | 0 |
|
||||
| TRACE | 10 |
|
||||
| DEBUG | 20 |
|
||||
| CONFIG | 30 |
|
||||
| INFO | 40 |
|
||||
| WARN | 50 |
|
||||
| ERROR | 60 |
|
||||
| FATAL | 70 |
|
||||
|
||||
The default logging level is INFO. All log messages are emitted to the browser
|
||||
console and stdout. Switching the logging level to DEBUG causes additional
|
||||
debug messages related to server requests (XHR) to be emitted.
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
mkdir tmp/
|
||||
git clone --no-checkout --depth 1 https://github.com/choller/firefox-asan-reporter tmp/
|
||||
(cd tmp && git reset --hard c42a0b9c131c90cec2a2e93efb77e02e1673316f)
|
||||
|
||||
# Copy only whitelisted files
|
||||
cp tmp/bootstrap.js tmp/install.rdf.in tmp/moz.build tmp/README.md tmp/LICENSE .
|
||||
|
||||
# Remove the temporary directory
|
||||
rm -Rf tmp/
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
||||
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||
|
||||
#filter substitution
|
||||
|
||||
<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:em="http://www.mozilla.org/2004/em-rdf#">
|
||||
|
||||
<Description about="urn:mozilla:install-manifest">
|
||||
<em:id>asan-reporter@mozilla.org</em:id>
|
||||
<em:version>1.0.0</em:version>
|
||||
<em:type>2</em:type>
|
||||
<em:bootstrap>true</em:bootstrap>
|
||||
<em:multiprocessCompatible>true</em:multiprocessCompatible>
|
||||
|
||||
<!-- Target Application this theme can install into,
|
||||
with minimum and maximum supported versions. -->
|
||||
<em:targetApplication>
|
||||
<Description>
|
||||
<!-- Firefox GUID -->
|
||||
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
|
||||
<em:minVersion>@MOZ_APP_VERSION@</em:minVersion>
|
||||
<em:maxVersion>@MOZ_APP_MAXVERSION@</em:maxVersion>
|
||||
</Description>
|
||||
</em:targetApplication>
|
||||
|
||||
<!-- Front End MetaData -->
|
||||
<em:name>ASan Crash Reporter</em:name>
|
||||
<em:description>Submit local ASan crash reports to Mozilla</em:description>
|
||||
</Description>
|
||||
</RDF>
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
|
||||
DEFINES['MOZ_APP_MAXVERSION'] = CONFIG['MOZ_APP_MAXVERSION']
|
||||
|
||||
FINAL_TARGET_FILES.features['asan-reporter@mozilla.org'] += [
|
||||
'bootstrap.js'
|
||||
]
|
||||
|
||||
FINAL_TARGET_PP_FILES.features['asan-reporter@mozilla.org'] += [
|
||||
'install.rdf.in'
|
||||
]
|
||||
|
|
@ -19,9 +19,3 @@ if CONFIG['MOZ_MORTAR']:
|
|||
DIRS += [
|
||||
'mortar',
|
||||
]
|
||||
|
||||
# Add ASan reporter system add-on if requested
|
||||
if CONFIG['MOZ_ASAN_REPORTER']:
|
||||
DIRS += [
|
||||
'asan-reporter',
|
||||
]
|
||||
|
|
|
|||
|
|
@ -3,16 +3,16 @@
|
|||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
const Cm = Components.manager;
|
||||
this.EXPORTED_SYMBOLS = ["AsanReporter"];
|
||||
|
||||
ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
|
||||
ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
|
||||
ChromeUtils.import("resource://gre/modules/Log.jsm");
|
||||
ChromeUtils.import("resource://gre/modules/Preferences.jsm");
|
||||
ChromeUtils.import("resource://gre/modules/Services.jsm");
|
||||
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
|
||||
ChromeUtils.defineModuleGetter(this, "OS", "resource://gre/modules/osfile.jsm");
|
||||
XPCOMUtils.defineLazyModuleGetters(this, {
|
||||
AppConstants: "resource://gre/modules/AppConstants.jsm",
|
||||
Log: "resource://gre/modules/Log.jsm",
|
||||
OS: "resource://gre/modules/osfile.jsm",
|
||||
Services: "resource://gre/modules/Services.jsm",
|
||||
});
|
||||
|
||||
XPCOMUtils.defineLazyGlobalGetters(this, ["TextDecoder", "XMLHttpRequest"]);
|
||||
|
||||
|
|
@ -22,24 +22,34 @@ const PREF_API_URL = "asanreporter.apiurl";
|
|||
const PREF_AUTH_TOKEN = "asanreporter.authtoken";
|
||||
const PREF_LOG_LEVEL = "asanreporter.loglevel";
|
||||
|
||||
// Setup logging
|
||||
const LOGGER_NAME = "extensions.asanreporter";
|
||||
let logger = Log.repository.getLogger(LOGGER_NAME);
|
||||
logger.addAppender(new Log.ConsoleAppender(new Log.BasicFormatter()));
|
||||
logger.addAppender(new Log.DumpAppender(new Log.BasicFormatter()));
|
||||
logger.level = Preferences.get(PREF_LOG_LEVEL, Log.Level.Info);
|
||||
const LOGGER_NAME = "asanreporter";
|
||||
|
||||
// Determine the directory where ASan dumps will be located
|
||||
let profileDir = Services.dirsvc.get("ProfD", Ci.nsIFile);
|
||||
let asanDumpDir = OS.Path.join(profileDir.path, "asan");
|
||||
let logger;
|
||||
|
||||
this.TabCrashObserver = {
|
||||
XPCOMUtils.defineLazyGetter(this, "asanDumpDir", () => {
|
||||
let profileDir = Services.dirsvc.get("ProfD", Ci.nsIFile);
|
||||
return OS.Path.join(profileDir.path, "asan");
|
||||
});
|
||||
|
||||
this.AsanReporter = {
|
||||
init() {
|
||||
if (this.initialized)
|
||||
return;
|
||||
this.initialized = true;
|
||||
|
||||
// Setup logging
|
||||
logger = Log.repository.getLogger(LOGGER_NAME);
|
||||
logger.addAppender(new Log.ConsoleAppender(new Log.BasicFormatter()));
|
||||
logger.addAppender(new Log.DumpAppender(new Log.BasicFormatter()));
|
||||
logger.level = Services.prefs.getIntPref(PREF_LOG_LEVEL, Log.Level.Info);
|
||||
|
||||
logger.info("Starting up...");
|
||||
|
||||
// Install a handler to observe tab crashes, so we can report those right
|
||||
// after they happen instead of relying on the user to restart the browser.
|
||||
Services.obs.addObserver(this, "ipc:content-shutdown");
|
||||
|
||||
processDirectory();
|
||||
},
|
||||
|
||||
observe(aSubject, aTopic, aData) {
|
||||
|
|
@ -48,31 +58,13 @@ this.TabCrashObserver = {
|
|||
if (!aSubject.get("abnormal")) {
|
||||
return;
|
||||
}
|
||||
processDirectory(asanDumpDir);
|
||||
processDirectory();
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
function install(aData, aReason) {}
|
||||
|
||||
function uninstall(aData, aReason) {}
|
||||
|
||||
function startup(aData, aReason) {
|
||||
logger.info("Starting up...");
|
||||
|
||||
// Install a handler to observe tab crashes, so we can report those right
|
||||
// after they happen instead of relying on the user to restart the browser.
|
||||
TabCrashObserver.init();
|
||||
|
||||
processDirectory(asanDumpDir);
|
||||
}
|
||||
|
||||
function shutdown(aData, aReason) {
|
||||
logger.info("Shutting down...");
|
||||
}
|
||||
|
||||
function processDirectory(pathString) {
|
||||
let iterator = new OS.File.DirectoryIterator(pathString);
|
||||
function processDirectory() {
|
||||
let iterator = new OS.File.DirectoryIterator(asanDumpDir);
|
||||
let results = [];
|
||||
|
||||
// Scan the directory for any ASan logs that we haven't
|
||||
|
|
@ -130,9 +122,9 @@ function submitReport(reportFile) {
|
|||
function submitToServer(data) {
|
||||
return new Promise(function(resolve, reject) {
|
||||
logger.debug("Setting up XHR request");
|
||||
let client = Preferences.get(PREF_CLIENT_ID);
|
||||
let api_url = Preferences.get(PREF_API_URL);
|
||||
let auth_token = Preferences.get(PREF_AUTH_TOKEN);
|
||||
let client = Services.prefs.getStringPref(PREF_CLIENT_ID);
|
||||
let api_url = Services.prefs.getStringPref(PREF_API_URL);
|
||||
let auth_token = Services.prefs.getStringPref(PREF_AUTH_TOKEN, null);
|
||||
|
||||
let decoder = new TextDecoder();
|
||||
|
||||
|
|
@ -40,6 +40,9 @@ with Files("test/unit/test_SitePermissions.js"):
|
|||
with Files("AboutNewTab.jsm"):
|
||||
BUG_COMPONENT = ("Firefox", "New Tab Page")
|
||||
|
||||
with Files("AsanReporter.jsm"):
|
||||
BUG_COMPONENT = ("Firefox Build System", "General")
|
||||
|
||||
with Files('AsyncTabSwitcher.jsm'):
|
||||
BUG_COMPONENT = ('Firefox', 'Tabbed Browser')
|
||||
|
||||
|
|
@ -148,6 +151,11 @@ EXTRA_JS_MODULES += [
|
|||
'ZoomUI.jsm',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_ASAN_REPORTER']:
|
||||
EXTRA_JS_MODULES += [
|
||||
'AsanReporter.jsm',
|
||||
]
|
||||
|
||||
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
|
||||
EXTRA_JS_MODULES += [
|
||||
'Windows8WindowFrameColor.jsm',
|
||||
|
|
|
|||
|
|
@ -2619,7 +2619,8 @@ MediaCacheStream::ReadBlockFromCache(AutoLock& aLock,
|
|||
// OffsetToBlockIndexUnchecked() is always non-negative.
|
||||
uint32_t index = OffsetToBlockIndexUnchecked(aOffset);
|
||||
int32_t cacheBlock = index < mBlocks.Length() ? mBlocks[index] : -1;
|
||||
if (cacheBlock < 0) {
|
||||
if (cacheBlock < 0 ||
|
||||
(mStreamLength >= 0 && aOffset >= mStreamLength)) {
|
||||
// Not in the cache.
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -2629,6 +2630,13 @@ MediaCacheStream::ReadBlockFromCache(AutoLock& aLock,
|
|||
// BLOCK_SIZE bytes.
|
||||
aBuffer = aBuffer.First(BLOCK_SIZE);
|
||||
}
|
||||
|
||||
if (mStreamLength >= 0 &&
|
||||
aBuffer.Length() > uint32_t(mStreamLength - aOffset)) {
|
||||
// Clamp reads to stream's length
|
||||
aBuffer = aBuffer.First(mStreamLength - aOffset);
|
||||
}
|
||||
|
||||
// |BLOCK_SIZE - OffsetInBlock(aOffset)| <= BLOCK_SIZE
|
||||
int32_t bytesToRead =
|
||||
std::min<int32_t>(BLOCK_SIZE - OffsetInBlock(aOffset), aBuffer.Length());
|
||||
|
|
|
|||
|
|
@ -93,6 +93,10 @@ from its prototype:
|
|||
: True if this instance refers to a `JSScript` for an async function, defined
|
||||
with an `async function` expression or statement. False otherwise.
|
||||
|
||||
`isModule`
|
||||
: True if this instance refers to a `JSScript` that was parsed and loaded
|
||||
as an ECMAScript module. False otherwise.
|
||||
|
||||
`displayName`
|
||||
: **If the instance refers to a `JSScript`**, this is the script's display
|
||||
name, if it has one. If the script has no display name — for example,
|
||||
|
|
|
|||
|
|
@ -131,10 +131,12 @@ class MOZ_STACK_CLASS BinTokenReaderBase
|
|||
return false;
|
||||
}
|
||||
|
||||
#ifndef FUZZING
|
||||
// Perform lookup, without side-effects.
|
||||
if (!std::equal(current_, current_ + N + (expectNul ? 0 : -1)/*implicit NUL*/, value)) {
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
||||
// Looks like we have a match. Now perform side-effects
|
||||
current_ += N + (expectNul ? 0 : -1);
|
||||
|
|
|
|||
|
|
@ -60,8 +60,8 @@ testBinASTReaderFuzz(const uint8_t* buf, size_t size) {
|
|||
Directives directives(false);
|
||||
GlobalSharedContext globalsc(gCx, ScopeKind::Global, directives, false);
|
||||
|
||||
BinASTParser<js::frontend::BinTokenReaderTester> reader(gCx, gCx->tempLifoAlloc(),
|
||||
binUsedNames, options);
|
||||
BinASTParser<js::frontend::BinTokenReaderMultipart> reader(gCx, gCx->tempLifoAlloc(),
|
||||
binUsedNames, options);
|
||||
|
||||
// Will be deallocated once `reader` goes out of scope.
|
||||
auto binParsed = reader.parse(&globalsc, binSource);
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
// Debugger.Object.prototype.isModule
|
||||
|
||||
const g = newGlobal();
|
||||
const dbg = Debugger(g);
|
||||
let count = 0;
|
||||
dbg.onNewScript = function (script) {
|
||||
count += 1;
|
||||
assertEq(script.isModule, true);
|
||||
};
|
||||
const m = g.parseModule("");
|
||||
g.instantiateModule(m);
|
||||
g.evaluateModule(m);
|
||||
assertEq(count, 1);
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
// Debugger.Object.prototype.isModule
|
||||
|
||||
const g = newGlobal();
|
||||
const dbg = Debugger(g);
|
||||
let count = 0;
|
||||
dbg.onNewScript = function (script) {
|
||||
count += 1;
|
||||
assertEq(script.isModule, false);
|
||||
};
|
||||
const m = g.eval("");
|
||||
assertEq(count, 1);
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
// Debugger.Object.prototype.isModule
|
||||
|
||||
const g = newGlobal();
|
||||
const dbg = Debugger(g);
|
||||
let count = 0;
|
||||
dbg.onNewScript = function (script) {
|
||||
count += 1;
|
||||
assertEq(script.isModule, true);
|
||||
|
||||
dbg.onNewScript = function (script) {
|
||||
count += 1;
|
||||
assertEq(script.isModule, false);
|
||||
};
|
||||
};
|
||||
const m = g.parseModule("eval('')");
|
||||
g.instantiateModule(m);
|
||||
g.evaluateModule(m);
|
||||
assertEq(count, 2);
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
// Debugger.Object.prototype.isModule
|
||||
|
||||
const g = newGlobal();
|
||||
const dbg = Debugger(g);
|
||||
let count = 0;
|
||||
dbg.onNewScript = function (script) {
|
||||
count += 1;
|
||||
assertEq(script.isModule, true);
|
||||
};
|
||||
dbg.onDebuggerStatement = function (frame) {
|
||||
const { script } = frame;
|
||||
|
||||
assertEq(script.isModule, false);
|
||||
};
|
||||
const m = g.parseModule("(function(){ debugger; })()");
|
||||
g.instantiateModule(m);
|
||||
g.evaluateModule(m);
|
||||
|
||||
assertEq(count, 1);
|
||||
|
|
@ -145,11 +145,13 @@ if CONFIG['NIGHTLY_BUILD']:
|
|||
'testErrorInterceptor.cpp',
|
||||
]
|
||||
|
||||
if CONFIG['JS_BUILD_BINAST'] and CONFIG['JS_STANDALONE']:
|
||||
if CONFIG['JS_BUILD_BINAST'] and CONFIG['JS_STANDALONE'] and not CONFIG['FUZZING']:
|
||||
# Standalone builds leave the source directory untouched,
|
||||
# which lets us run tests with the data files intact.
|
||||
# Otherwise, in the current state of the build system,
|
||||
# we can't have data files in js/src tests.
|
||||
# Also, fuzzing builds modify the const matching in the
|
||||
# token reader and hence affect the correctness of the tests.
|
||||
UNIFIED_SOURCES += [
|
||||
'testBinASTReader.cpp',
|
||||
'testBinTokenReaderTester.cpp'
|
||||
|
|
|
|||
|
|
@ -723,9 +723,11 @@ if CONFIG['JS_BUILD_BINAST']:
|
|||
|
||||
# Instrument BinAST files for fuzzing as we have a fuzzing target for BinAST.
|
||||
if CONFIG['FUZZING_INTERFACES'] and CONFIG['LIBFUZZER']:
|
||||
SOURCES['frontend/BinSource-auto.cpp'].flags += libfuzzer_flags
|
||||
SOURCES['frontend/BinSource.cpp'].flags += libfuzzer_flags
|
||||
SOURCES['frontend/BinToken.cpp'].flags += libfuzzer_flags
|
||||
SOURCES['frontend/BinTokenReaderTester.cpp'].flags += libfuzzer_flags
|
||||
SOURCES['frontend/BinTokenReaderBase.cpp'].flags += libfuzzer_flags
|
||||
SOURCES['frontend/BinTokenReaderMultipart.cpp'].flags += libfuzzer_flags
|
||||
|
||||
# Wasm code should use WASM_HUGE_MEMORY instead of JS_CODEGEN_X64
|
||||
# so that it is easy to use the huge-mapping optimization for other
|
||||
|
|
|
|||
|
|
@ -5818,6 +5818,16 @@ DebuggerScript_getIsAsyncFunction(JSContext* cx, unsigned argc, Value* vp)
|
|||
return true;
|
||||
}
|
||||
|
||||
static bool
|
||||
DebuggerScript_getIsModule(JSContext* cx, unsigned argc, Value* vp)
|
||||
{
|
||||
THIS_DEBUGSCRIPT_SCRIPT_MAYBE_LAZY(cx, argc, vp, "(get isModule)", args, obj);
|
||||
DebuggerScriptReferent referent = GetScriptReferent(obj);
|
||||
args.rval().setBoolean(referent.is<JSScript*>() &&
|
||||
referent.as<JSScript*>()->isModule());
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool
|
||||
DebuggerScript_getDisplayName(JSContext* cx, unsigned argc, Value* vp)
|
||||
{
|
||||
|
|
@ -7420,6 +7430,7 @@ DebuggerScript_construct(JSContext* cx, unsigned argc, Value* vp)
|
|||
static const JSPropertySpec DebuggerScript_properties[] = {
|
||||
JS_PSG("isGeneratorFunction", DebuggerScript_getIsGeneratorFunction, 0),
|
||||
JS_PSG("isAsyncFunction", DebuggerScript_getIsAsyncFunction, 0),
|
||||
JS_PSG("isModule", DebuggerScript_getIsModule, 0),
|
||||
JS_PSG("displayName", DebuggerScript_getDisplayName, 0),
|
||||
JS_PSG("url", DebuggerScript_getUrl, 0),
|
||||
JS_PSG("startLine", DebuggerScript_getStartLine, 0),
|
||||
|
|
|
|||
|
|
@ -1714,8 +1714,9 @@ class JSScript : public js::gc::TenuredCell
|
|||
*/
|
||||
inline void ensureNonLazyCanonicalFunction();
|
||||
|
||||
bool isModule() const { return bodyScope()->is<js::ModuleScope>(); }
|
||||
js::ModuleObject* module() const {
|
||||
if (bodyScope()->is<js::ModuleScope>()) {
|
||||
if (isModule()) {
|
||||
return bodyScope()->as<js::ModuleScope>().module();
|
||||
}
|
||||
return nullptr;
|
||||
|
|
|
|||
|
|
@ -558,6 +558,7 @@ nsNSSComponent::UnloadFamilySafetyRoot()
|
|||
// 1: only attempt to detect Family Safety mode (don't import the root)
|
||||
// 2: detect Family Safety mode and import the root
|
||||
const char* kFamilySafetyModePref = "security.family_safety.mode";
|
||||
const uint32_t kFamilySafetyModeDefault = 0;
|
||||
|
||||
// The telemetry gathered by this function is as follows:
|
||||
// 0-2: the value of the Family Safety mode pref
|
||||
|
|
@ -567,16 +568,12 @@ const char* kFamilySafetyModePref = "security.family_safety.mode";
|
|||
// 6: failed to import the Family Safety root
|
||||
// 7: successfully imported the root
|
||||
void
|
||||
nsNSSComponent::MaybeEnableFamilySafetyCompatibility()
|
||||
nsNSSComponent::MaybeEnableFamilySafetyCompatibility(uint32_t familySafetyMode)
|
||||
{
|
||||
#ifdef XP_WIN
|
||||
if (!(IsWin8Point1OrLater() && !IsWin10OrLater())) {
|
||||
return;
|
||||
}
|
||||
// Disabled by default.
|
||||
const uint32_t FAMILY_SAFETY_MODE_DEFAULT = 0;
|
||||
uint32_t familySafetyMode = Preferences::GetUint(kFamilySafetyModePref,
|
||||
FAMILY_SAFETY_MODE_DEFAULT);
|
||||
if (familySafetyMode > 2) {
|
||||
familySafetyMode = 0;
|
||||
}
|
||||
|
|
@ -781,10 +778,12 @@ class LoadLoadableRootsTask final : public Runnable
|
|||
{
|
||||
public:
|
||||
explicit LoadLoadableRootsTask(nsNSSComponent* nssComponent,
|
||||
bool importEnterpriseRoots)
|
||||
bool importEnterpriseRoots,
|
||||
uint32_t familySafetyMode)
|
||||
: Runnable("LoadLoadableRootsTask")
|
||||
, mNSSComponent(nssComponent)
|
||||
, mImportEnterpriseRoots(importEnterpriseRoots)
|
||||
, mFamilySafetyMode(familySafetyMode)
|
||||
{
|
||||
MOZ_ASSERT(nssComponent);
|
||||
}
|
||||
|
|
@ -798,6 +797,7 @@ private:
|
|||
nsresult LoadLoadableRoots();
|
||||
RefPtr<nsNSSComponent> mNSSComponent;
|
||||
bool mImportEnterpriseRoots;
|
||||
uint32_t mFamilySafetyMode;
|
||||
nsCOMPtr<nsIThread> mThread;
|
||||
};
|
||||
|
||||
|
|
@ -858,6 +858,7 @@ LoadLoadableRootsTask::Run()
|
|||
if (mImportEnterpriseRoots) {
|
||||
mNSSComponent->ImportEnterpriseRoots();
|
||||
}
|
||||
mNSSComponent->MaybeEnableFamilySafetyCompatibility(mFamilySafetyMode);
|
||||
nsresult rv = mNSSComponent->TrustLoaded3rdPartyRoots();
|
||||
if (NS_FAILED(rv)) {
|
||||
MOZ_LOG(gPIPNSSLog, LogLevel::Error,
|
||||
|
|
@ -1870,14 +1871,6 @@ nsNSSComponent::InitializeNSS()
|
|||
|
||||
DisableMD5();
|
||||
|
||||
// Note that this function does not change the trust of any loaded 3rd party
|
||||
// roots. Because we're initializing the nsNSSComponent, and because if the
|
||||
// user has a master password set on the softoken it could cause the
|
||||
// authentication dialog to come up, we could conceivably re-enter
|
||||
// nsNSSComponent initialization, which would be bad. Instead, we set the
|
||||
// trust when the load loadable roots task finishes (below).
|
||||
MaybeEnableFamilySafetyCompatibility();
|
||||
|
||||
ConfigureTLSSessionIdentifiers();
|
||||
|
||||
bool requireSafeNegotiation =
|
||||
|
|
@ -1969,8 +1962,10 @@ nsNSSComponent::InitializeNSS()
|
|||
|
||||
bool importEnterpriseRoots = Preferences::GetBool(kEnterpriseRootModePref,
|
||||
false);
|
||||
uint32_t familySafetyMode = Preferences::GetUint(kFamilySafetyModePref,
|
||||
kFamilySafetyModeDefault);
|
||||
RefPtr<LoadLoadableRootsTask> loadLoadableRootsTask(
|
||||
new LoadLoadableRootsTask(this, importEnterpriseRoots));
|
||||
new LoadLoadableRootsTask(this, importEnterpriseRoots, familySafetyMode));
|
||||
rv = loadLoadableRootsTask->Dispatch();
|
||||
if (NS_FAILED(rv)) {
|
||||
return rv;
|
||||
|
|
@ -2126,7 +2121,9 @@ nsNSSComponent::Observe(nsISupports* aSubject, const char* aTopic,
|
|||
// When the pref changes, it is safe to change the trust of 3rd party
|
||||
// roots in the same event tick that they're loaded.
|
||||
UnloadFamilySafetyRoot();
|
||||
MaybeEnableFamilySafetyCompatibility();
|
||||
uint32_t familySafetyMode = Preferences::GetUint(
|
||||
kFamilySafetyModePref, kFamilySafetyModeDefault);
|
||||
MaybeEnableFamilySafetyCompatibility(familySafetyMode);
|
||||
TrustLoaded3rdPartyRoots();
|
||||
} else if (prefName.EqualsLiteral("security.content.signature.root_hash")) {
|
||||
MutexAutoLock lock(mMutex);
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ private:
|
|||
void ImportEnterpriseRoots();
|
||||
void UnloadEnterpriseRoots();
|
||||
|
||||
void MaybeEnableFamilySafetyCompatibility();
|
||||
void MaybeEnableFamilySafetyCompatibility(uint32_t familySafetyMode);
|
||||
void UnloadFamilySafetyRoot();
|
||||
|
||||
nsresult TrustLoaded3rdPartyRoots();
|
||||
|
|
|
|||
|
|
@ -1100,6 +1100,11 @@ public:
|
|||
#endif
|
||||
return Allow();
|
||||
|
||||
#ifdef DESKTOP
|
||||
case __NR_sched_setaffinity:
|
||||
return Error(EPERM);
|
||||
#endif
|
||||
|
||||
#ifdef DESKTOP
|
||||
case __NR_pipe2:
|
||||
return Allow();
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ release-promotion:
|
|||
target-tasks-method: promote_desktop
|
||||
promote_firefox_rc:
|
||||
product: firefox
|
||||
release-type: rc
|
||||
is-rc: true
|
||||
target-tasks-method: promote_desktop
|
||||
partial-updates: true
|
||||
push_devedition:
|
||||
|
|
@ -163,7 +163,7 @@ release-promotion:
|
|||
version-bump: true
|
||||
ship_fennec_rc:
|
||||
product: fennec
|
||||
release-type: rc
|
||||
is-rc: true
|
||||
target-tasks-method: ship_fennec
|
||||
ship_firefox:
|
||||
product: firefox
|
||||
|
|
@ -172,7 +172,7 @@ release-promotion:
|
|||
partial-updates: true
|
||||
ship_firefox_rc:
|
||||
product: firefox
|
||||
release-type: rc
|
||||
is-rc: true
|
||||
target-tasks-method: ship_desktop
|
||||
partial-updates: true
|
||||
|
||||
|
|
|
|||
|
|
@ -28,15 +28,10 @@ jobs:
|
|||
upstream-artifacts: # see transforms
|
||||
google-play-track:
|
||||
# See https://github.com/mozilla-releng/pushapkscript#aurora-beta-release-vs-alpha-beta-production
|
||||
by-project:
|
||||
mozilla-central: 'beta'
|
||||
mozilla-beta: 'rollout'
|
||||
mozilla-release: 'rollout'
|
||||
default: 'internal'
|
||||
rc-google-play-track:
|
||||
by-project:
|
||||
mozilla-release: 'rollout'
|
||||
birch: 'rollout'
|
||||
by-release-type:
|
||||
nightly: 'beta'
|
||||
beta: 'rollout'
|
||||
release(-rc)?: 'rollout'
|
||||
default: 'internal'
|
||||
implementation: push-apk
|
||||
commit:
|
||||
|
|
@ -44,16 +39,12 @@ jobs:
|
|||
production: true
|
||||
staging: false
|
||||
rollout-percentage:
|
||||
by-project:
|
||||
by-release-type:
|
||||
# XXX Please make sure to change PUSH_APK_GOOGLE_PLAY_TRACT to
|
||||
# 'rollout' if you add a new supported project
|
||||
mozilla-release: 10
|
||||
mozilla-beta: 10
|
||||
default: null
|
||||
rc-rollout-percentage:
|
||||
by-project:
|
||||
mozilla-release: 5
|
||||
birch: 5
|
||||
release: 10
|
||||
release-rc: 5
|
||||
beta: 10
|
||||
default: null
|
||||
requires: all-resolved
|
||||
scopes: # see transforms
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
loader: taskgraph.loader.transform:loader
|
||||
|
||||
transforms:
|
||||
- taskgraph.transforms.release:run_on_releases
|
||||
- taskgraph.transforms.release_deps:transforms
|
||||
- taskgraph.transforms.scriptworker:add_balrog_scopes
|
||||
- taskgraph.transforms.task:transforms
|
||||
|
|
@ -27,30 +28,32 @@ jobs:
|
|||
worker:
|
||||
product: firefox
|
||||
publish-rules:
|
||||
by-project:
|
||||
maple: [32]
|
||||
birch: [145]
|
||||
jamun: [724]
|
||||
mozilla-beta: [32]
|
||||
mozilla-release: [145]
|
||||
mozilla-esr60: [806]
|
||||
default: []
|
||||
by-release-level:
|
||||
production:
|
||||
by-release-type:
|
||||
beta: [32]
|
||||
release: [145]
|
||||
esr60: [806]
|
||||
default: []
|
||||
staging:
|
||||
by-release-type:
|
||||
beta: [32]
|
||||
release: [145]
|
||||
esr60: [724]
|
||||
default: []
|
||||
treeherder:
|
||||
platform: firefox-release/opt
|
||||
symbol: Rel(BSFx)
|
||||
tier: 1
|
||||
kind: build
|
||||
# FIXME: (Bug 1487172) This task should only run on esr60-like branches
|
||||
firefox-bz2:
|
||||
description: Schedule Firefox publishing in balrog (bz2)
|
||||
name: release-firefox_schedule_publishing_in_balrog-bz2
|
||||
shipping-product: firefox
|
||||
run-on-releases: [esr60]
|
||||
worker:
|
||||
product: firefox
|
||||
publish-rules:
|
||||
by-project:
|
||||
mozilla-esr60: [521]
|
||||
default: []
|
||||
publish-rules: [521]
|
||||
blob-suffix: -bz2
|
||||
treeherder:
|
||||
platform: firefox-release/opt
|
||||
|
|
@ -63,11 +66,7 @@ jobs:
|
|||
shipping-product: devedition
|
||||
worker:
|
||||
product: devedition
|
||||
publish-rules:
|
||||
by-project:
|
||||
maple: [10]
|
||||
mozilla-beta: [10]
|
||||
default: []
|
||||
publish-rules: [10]
|
||||
treeherder:
|
||||
platform: devedition-release/opt
|
||||
symbol: Rel(BSDev)
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
loader: taskgraph.loader.transform:loader
|
||||
|
||||
transforms:
|
||||
- taskgraph.transforms.release:run_on_releases
|
||||
- taskgraph.transforms.release_deps:transforms
|
||||
- taskgraph.transforms.scriptworker:add_balrog_scopes
|
||||
- taskgraph.transforms.task:transforms
|
||||
|
|
@ -33,31 +34,30 @@ jobs:
|
|||
worker:
|
||||
product: firefox
|
||||
channel-names:
|
||||
by-project:
|
||||
maple: ["beta", "beta-localtest", "beta-cdntest"]
|
||||
birch: ["release", "release-localtest", "release-cdntest"]
|
||||
jamun: ["esr", "esr-localtest", "esr-cdntest"]
|
||||
mozilla-beta: ["beta", "beta-localtest", "beta-cdntest"]
|
||||
mozilla-release: ["release", "release-localtest", "release-cdntest"]
|
||||
mozilla-esr60: ["esr", "esr-localtest", "esr-cdntest"]
|
||||
by-release-type:
|
||||
beta: ["beta", "beta-localtest", "beta-cdntest"]
|
||||
release(-rc)?: ["release", "release-localtest", "release-cdntest"]
|
||||
esr60: ["esr", "esr-localtest", "esr-cdntest"]
|
||||
default: []
|
||||
publish-rules:
|
||||
by-project:
|
||||
maple: [32]
|
||||
birch: [145]
|
||||
jamun: [724]
|
||||
mozilla-beta: [32]
|
||||
mozilla-release: [145]
|
||||
mozilla-esr60: [806]
|
||||
default: []
|
||||
by-release-level:
|
||||
production:
|
||||
by-release-type:
|
||||
beta: [32]
|
||||
release(-rc)?: [145]
|
||||
esr60: [806]
|
||||
default: []
|
||||
staging:
|
||||
by-release-type:
|
||||
beta: [32]
|
||||
release(-rc)?: [145]
|
||||
esr60: [724]
|
||||
default: []
|
||||
rules-to-update:
|
||||
by-project:
|
||||
maple: ["firefox-beta-cdntest", "firefox-beta-localtest"]
|
||||
birch: ["firefox-release-cdntest", "firefox-release-localtest"]
|
||||
jamun: ["firefox-esr60-cdntest", "firefox-esr60-localtest"]
|
||||
mozilla-beta: ["firefox-beta-cdntest", "firefox-beta-localtest"]
|
||||
mozilla-release: ["firefox-release-cdntest", "firefox-release-localtest"]
|
||||
mozilla-esr60: ["firefox-esr60-cdntest", "firefox-esr60-localtest"]
|
||||
by-release-type:
|
||||
beta: ["firefox-beta-cdntest", "firefox-beta-localtest"]
|
||||
release(-rc)?: ["firefox-release-cdntest", "firefox-release-localtest"]
|
||||
esr60: ["firefox-esr60-cdntest", "firefox-esr60-localtest"]
|
||||
default: []
|
||||
platforms: ["linux", "linux64", "macosx64", "win32", "win64"]
|
||||
treeherder:
|
||||
|
|
@ -66,25 +66,19 @@ jobs:
|
|||
tier: 1
|
||||
kind: build
|
||||
|
||||
# FIXME: (Bug 1487172) This task should only run on esr60-like branches
|
||||
firefox-bz2:
|
||||
name: submit-toplevel-firefox-release-to-balrog-bz2
|
||||
description: Submit toplevel Firefox release to balrog
|
||||
shipping-product: firefox
|
||||
run-on-releases: [esr60]
|
||||
worker:
|
||||
product: firefox
|
||||
channel-names:
|
||||
by-project:
|
||||
mozilla-esr60: ["esr", "esr-localtest", "esr-cdntest"]
|
||||
default: []
|
||||
channel-names: ["esr", "esr-localtest", "esr-cdntest"]
|
||||
publish-rules:
|
||||
by-project:
|
||||
mozilla-esr60: [521]
|
||||
default: []
|
||||
rules-to-update:
|
||||
by-project:
|
||||
mozilla-esr60: ["esr52-cdntest", "esr52-localtest"]
|
||||
default: []
|
||||
by-release-level:
|
||||
production: [521]
|
||||
staging: [521]
|
||||
rules-to-update: ["esr52-cdntest", "esr52-localtest"]
|
||||
platforms: ["linux", "linux64", "macosx64", "win32", "win64"]
|
||||
blob-suffix: -bz2
|
||||
complete-mar-filename-pattern: '%s-%s.bz2.complete.mar'
|
||||
|
|
@ -99,23 +93,12 @@ jobs:
|
|||
name: submit-toplevel-devedition-release-to-balrog
|
||||
description: submit toplevel Devedition release to balrog
|
||||
shipping-product: devedition
|
||||
run-on-releases: [beta]
|
||||
worker:
|
||||
product: devedition
|
||||
channel-names:
|
||||
by-project:
|
||||
maple: ["aurora", "aurora-localtest", "aurora-cdntest"]
|
||||
mozilla-beta: ["aurora", "aurora-localtest", "aurora-cdntest"]
|
||||
default: []
|
||||
publish-rules:
|
||||
by-project:
|
||||
maple: [10]
|
||||
mozilla-beta: [10]
|
||||
default: []
|
||||
rules-to-update:
|
||||
by-project:
|
||||
maple: ["devedition-cdntest", "devedition-localtest"]
|
||||
mozilla-beta: ["devedition-cdntest", "devedition-localtest"]
|
||||
default: []
|
||||
channel-names: ["aurora", "aurora-localtest", "aurora-cdntest"]
|
||||
publish-rules: [10]
|
||||
rules-to-update: ["devedition-cdntest", "devedition-localtest"]
|
||||
platforms: ["linux", "linux64", "macosx64", "win32", "win64"]
|
||||
treeherder:
|
||||
platform: devedition-release/opt
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
loader: taskgraph.loader.transform:loader
|
||||
|
||||
transforms:
|
||||
- taskgraph.transforms.release:run_on_releases
|
||||
- taskgraph.transforms.bouncer_submission:transforms
|
||||
- taskgraph.transforms.task:transforms
|
||||
|
||||
|
|
@ -64,6 +65,7 @@ jobs:
|
|||
bouncer-platforms: ['linux', 'linux64', 'osx', 'win', 'win64']
|
||||
bouncer-products: ['complete-mar-candidates', 'partial-mar-candidates']
|
||||
shipping-product: firefox
|
||||
run-on-releases: ['release-rc']
|
||||
treeherder:
|
||||
symbol: Rel(BncSub-RC)
|
||||
platform: firefox-release/opt
|
||||
|
|
|
|||
|
|
@ -29,25 +29,9 @@ jobs:
|
|||
worker:
|
||||
product: firefox
|
||||
release-eta: ''
|
||||
channel-names:
|
||||
by-project:
|
||||
birch: ["beta", "beta-localtest", "beta-cdntest"]
|
||||
jamun: ["esr", "esr-localtest", "esr-cdntest"]
|
||||
mozilla-release: ["beta", "beta-localtest", "beta-cdntest"]
|
||||
mozilla-esr60: ["esr", "esr-localtest", "esr-cdntest"]
|
||||
default: []
|
||||
publish-rules:
|
||||
by-project:
|
||||
birch: [32]
|
||||
mozilla-release: [32]
|
||||
default: []
|
||||
rules-to-update:
|
||||
by-project:
|
||||
birch: ["firefox-beta-cdntest", "firefox-beta-localtest"]
|
||||
jamun: ["firefox-esr60-cdntest", "firefox-esr60-localtest"]
|
||||
mozilla-release: ["firefox-beta-cdntest", "firefox-beta-localtest"]
|
||||
mozilla-esr60: ["firefox-esr60-cdntest", "firefox-esr60-localtest"]
|
||||
default: []
|
||||
channel-names: ["beta", "beta-localtest", "beta-cdntest"]
|
||||
publish-rules: [32]
|
||||
rules-to-update: ["firefox-beta-cdntest", "firefox-beta-localtest"]
|
||||
treeherder:
|
||||
platform: linux64/opt
|
||||
symbol: Rel(BSFxRC)
|
||||
|
|
|
|||
|
|
@ -33,27 +33,9 @@ jobs:
|
|||
shipping-product: firefox
|
||||
worker:
|
||||
product: firefox
|
||||
channel-names:
|
||||
by-project:
|
||||
birch: ["beta", "beta-localtest", "beta-cdntest"]
|
||||
jamun: ["esr", "esr-localtest", "esr-cdntest"]
|
||||
mozilla-release: ["beta", "beta-localtest", "beta-cdntest"]
|
||||
mozilla-esr60: ["esr", "esr-localtest", "esr-cdntest"]
|
||||
default: []
|
||||
publish-rules:
|
||||
by-project:
|
||||
birch: [32]
|
||||
jamun: [724]
|
||||
mozilla-release: [32]
|
||||
mozilla-esr60: []
|
||||
default: []
|
||||
rules-to-update:
|
||||
by-project:
|
||||
birch: ["firefox-beta-cdntest", "firefox-beta-localtest"]
|
||||
jamun: ["firefox-esr60-cdntest", "firefox-esr60-localtest"]
|
||||
mozilla-release: ["firefox-beta-cdntest", "firefox-beta-localtest"]
|
||||
mozilla-esr60: ["firefox-esr60-cdntest", "firefox-esr60-localtest"]
|
||||
default: []
|
||||
channel-names: ["beta", "beta-localtest", "beta-cdntest"]
|
||||
publish-rules: [32]
|
||||
rules-to-update: ["firefox-beta-cdntest", "firefox-beta-localtest"]
|
||||
treeherder:
|
||||
platform: linux64/opt
|
||||
symbol: Rel(BPFxRC)
|
||||
|
|
|
|||
|
|
@ -46,26 +46,10 @@ job-defaults:
|
|||
by-release-level:
|
||||
staging: dep
|
||||
production: null
|
||||
include-version:
|
||||
by-project:
|
||||
birch: beta
|
||||
mozilla-release: beta
|
||||
default: null
|
||||
last-watershed:
|
||||
by-project:
|
||||
birch: "56.0b3"
|
||||
mozilla-release: "56.0b3"
|
||||
default: null
|
||||
mar-channel-id-override:
|
||||
by-project:
|
||||
birch: beta
|
||||
mozilla-release: beta
|
||||
default: null
|
||||
channel:
|
||||
by-project:
|
||||
birch: "beta-localtest"
|
||||
mozilla-release: "beta-localtest"
|
||||
default: "default"
|
||||
include-version: beta
|
||||
last-watershed: "56.0b3"
|
||||
mar-channel-id-override: beta
|
||||
channel: "beta-localtest"
|
||||
|
||||
jobs:
|
||||
firefox-secondary-linux:
|
||||
|
|
|
|||
|
|
@ -50,17 +50,15 @@ job-defaults:
|
|||
# The devedition override can be removed after 58.0b1
|
||||
# is behind a watershed
|
||||
include-version:
|
||||
by-project:
|
||||
birch: nonbeta
|
||||
jamun: esr
|
||||
maple: beta
|
||||
mozilla-beta: beta
|
||||
mozilla-release: nonbeta
|
||||
mozilla-esr60: esr
|
||||
default: null
|
||||
by-release-type:
|
||||
beta: beta
|
||||
release(-rc)?: nonbeta
|
||||
esr60: esr
|
||||
nightly: beta
|
||||
last-watershed:
|
||||
by-project:
|
||||
birch:
|
||||
by-release-type:
|
||||
beta: "56.0b3"
|
||||
release(-rc)?:
|
||||
by-platform:
|
||||
linux-.*: "57.0"
|
||||
linux64-.*: "57.0"
|
||||
|
|
@ -68,25 +66,8 @@ job-defaults:
|
|||
win32-.*: "56.0"
|
||||
win64-.*: "56.0"
|
||||
default: null
|
||||
jamun: "56.0b3"
|
||||
maple: "56.0b3"
|
||||
mozilla-beta: "56.0b3"
|
||||
mozilla-release:
|
||||
by-platform:
|
||||
linux-.*: "57.0"
|
||||
linux64-.*: "57.0"
|
||||
macosx64-.*: "57.0"
|
||||
win32-.*: "56.0"
|
||||
win64-.*: "56.0"
|
||||
default: null
|
||||
mozilla-esr52:
|
||||
by-platform:
|
||||
macosx64: "45.9.0esr"
|
||||
win32: "45.3.0esr"
|
||||
win64: "45.3.0esr"
|
||||
default: null
|
||||
mozilla-esr60: "52.0esr"
|
||||
default: null
|
||||
esr60: "52.0esr"
|
||||
nightly: "default"
|
||||
|
||||
jobs:
|
||||
firefox-linux:
|
||||
|
|
@ -103,19 +84,14 @@ jobs:
|
|||
platform: linux-i686
|
||||
updater-platform: linux-x86_64
|
||||
channel:
|
||||
by-project:
|
||||
birch: "release-localtest"
|
||||
jamun: "beta-localtest"
|
||||
maple: "beta-localtest"
|
||||
mozilla-beta: "beta-localtest"
|
||||
mozilla-release: "release-localtest"
|
||||
mozilla-esr52: "esr-localtest"
|
||||
mozilla-esr60: "esr-localtest"
|
||||
default: "default"
|
||||
by-release-type:
|
||||
beta: "beta-localtest"
|
||||
release(-rc)?: "release-localtest"
|
||||
esr60: "esr-localtest"
|
||||
nightly: "default"
|
||||
mar-channel-id-override:
|
||||
by-project:
|
||||
maple: beta
|
||||
mozilla-beta: beta
|
||||
by-release-type:
|
||||
beta: beta
|
||||
default: null
|
||||
|
||||
firefox-linux64:
|
||||
|
|
@ -132,19 +108,14 @@ jobs:
|
|||
platform: linux-x86_64
|
||||
updater-platform: linux-x86_64
|
||||
channel:
|
||||
by-project:
|
||||
birch: "release-localtest"
|
||||
jamun: "beta-localtest"
|
||||
maple: "beta-localtest"
|
||||
mozilla-beta: "beta-localtest"
|
||||
mozilla-release: "release-localtest"
|
||||
mozilla-esr52: "esr-localtest"
|
||||
mozilla-esr60: "esr-localtest"
|
||||
default: "default"
|
||||
by-release-type:
|
||||
beta: "beta-localtest"
|
||||
release(-rc)?: "release-localtest"
|
||||
esr60: "esr-localtest"
|
||||
nightly: "default"
|
||||
mar-channel-id-override:
|
||||
by-project:
|
||||
maple: beta
|
||||
mozilla-beta: beta
|
||||
by-release-type:
|
||||
beta: beta
|
||||
default: null
|
||||
|
||||
firefox-macosx64:
|
||||
|
|
@ -161,19 +132,14 @@ jobs:
|
|||
platform: mac
|
||||
updater-platform: linux-x86_64
|
||||
channel:
|
||||
by-project:
|
||||
birch: "release-localtest"
|
||||
jamun: "beta-localtest"
|
||||
maple: "beta-localtest"
|
||||
mozilla-beta: "beta-localtest"
|
||||
mozilla-release: "release-localtest"
|
||||
mozilla-esr52: "esr-localtest"
|
||||
mozilla-esr60: "esr-localtest"
|
||||
default: "default"
|
||||
by-release-type:
|
||||
beta: "beta-localtest"
|
||||
release(-rc)?: "release-localtest"
|
||||
esr60: "esr-localtest"
|
||||
nightly: "default"
|
||||
mar-channel-id-override:
|
||||
by-project:
|
||||
maple: beta
|
||||
mozilla-beta: beta
|
||||
by-release-type:
|
||||
beta: beta
|
||||
default: null
|
||||
|
||||
firefox-win32:
|
||||
|
|
@ -190,19 +156,14 @@ jobs:
|
|||
platform: win32
|
||||
updater-platform: linux-x86_64
|
||||
channel:
|
||||
by-project:
|
||||
birch: "release-localtest"
|
||||
jamun: "beta-localtest"
|
||||
maple: "beta-localtest"
|
||||
mozilla-beta: "beta-localtest"
|
||||
mozilla-release: "release-localtest"
|
||||
mozilla-esr52: "esr-localtest"
|
||||
mozilla-esr60: "esr-localtest"
|
||||
default: "default"
|
||||
by-release-type:
|
||||
beta: "beta-localtest"
|
||||
release(-rc)?: "release-localtest"
|
||||
esr60: "esr-localtest"
|
||||
nightly: "default"
|
||||
mar-channel-id-override:
|
||||
by-project:
|
||||
maple: beta
|
||||
mozilla-beta: beta
|
||||
by-release-type:
|
||||
beta: beta
|
||||
default: null
|
||||
|
||||
firefox-win64:
|
||||
|
|
@ -219,19 +180,14 @@ jobs:
|
|||
platform: win64
|
||||
updater-platform: linux-x86_64
|
||||
channel:
|
||||
by-project:
|
||||
birch: "release-localtest"
|
||||
jamun: "beta-localtest"
|
||||
maple: "beta-localtest"
|
||||
mozilla-beta: "beta-localtest"
|
||||
mozilla-release: "release-localtest"
|
||||
mozilla-esr52: "esr-localtest"
|
||||
mozilla-esr60: "esr-localtest"
|
||||
default: "default"
|
||||
by-release-type:
|
||||
beta: "beta-localtest"
|
||||
release(-rc)?: "release-localtest"
|
||||
esr60: "esr-localtest"
|
||||
nightly: "default"
|
||||
mar-channel-id-override:
|
||||
by-project:
|
||||
maple: beta
|
||||
mozilla-beta: beta
|
||||
by-release-type:
|
||||
beta: beta
|
||||
default: null
|
||||
|
||||
devedition-linux:
|
||||
|
|
|
|||
|
|
@ -50,14 +50,11 @@ jobs:
|
|||
worker:
|
||||
env:
|
||||
CHANNEL:
|
||||
by-project:
|
||||
birch: "release-localtest"
|
||||
jamun: "beta-localtest"
|
||||
maple: "beta-localtest"
|
||||
mozilla-beta: "beta-localtest"
|
||||
mozilla-release: "release-localtest"
|
||||
mozilla-esr60: "esr-localtest"
|
||||
default: "default"
|
||||
by-release-type:
|
||||
beta: "beta-localtest"
|
||||
release(-rc)?: "release-localtest"
|
||||
esr60: "esr-localtest"
|
||||
nightly: "nightly"
|
||||
treeherder:
|
||||
symbol: UV(UV)
|
||||
platform: linux64/opt
|
||||
|
|
@ -72,14 +69,11 @@ jobs:
|
|||
worker:
|
||||
env:
|
||||
CHANNEL:
|
||||
by-project:
|
||||
birch: "release-localtest"
|
||||
jamun: "beta-localtest"
|
||||
maple: "beta-localtest"
|
||||
mozilla-beta: "beta-localtest"
|
||||
mozilla-release: "release-localtest"
|
||||
mozilla-esr60: "esr-localtest"
|
||||
default: "default"
|
||||
by-release-type:
|
||||
beta: "beta-localtest"
|
||||
release(-rc)?: "release-localtest"
|
||||
esr60: "esr-localtest"
|
||||
nightly: "nightly"
|
||||
treeherder:
|
||||
symbol: UV(UV)
|
||||
platform: linux32/opt
|
||||
|
|
@ -94,14 +88,11 @@ jobs:
|
|||
worker:
|
||||
env:
|
||||
CHANNEL:
|
||||
by-project:
|
||||
birch: "release-localtest"
|
||||
jamun: "beta-localtest"
|
||||
maple: "beta-localtest"
|
||||
mozilla-beta: "beta-localtest"
|
||||
mozilla-release: "release-localtest"
|
||||
mozilla-esr60: "esr-localtest"
|
||||
default: "default"
|
||||
by-release-type:
|
||||
beta: "beta-localtest"
|
||||
release(-rc)?: "release-localtest"
|
||||
esr60: "esr-localtest"
|
||||
nightly: "nightly"
|
||||
treeherder:
|
||||
symbol: UV(UV)
|
||||
platform: windows2012-64/opt
|
||||
|
|
@ -116,14 +107,11 @@ jobs:
|
|||
worker:
|
||||
env:
|
||||
CHANNEL:
|
||||
by-project:
|
||||
birch: "release-localtest"
|
||||
jamun: "beta-localtest"
|
||||
maple: "beta-localtest"
|
||||
mozilla-beta: "beta-localtest"
|
||||
mozilla-release: "release-localtest"
|
||||
mozilla-esr60: "esr-localtest"
|
||||
default: "default"
|
||||
by-release-type:
|
||||
beta: "beta-localtest"
|
||||
release(-rc)?: "release-localtest"
|
||||
esr60: "esr-localtest"
|
||||
nightly: "nightly"
|
||||
treeherder:
|
||||
symbol: UV(UV)
|
||||
platform: windows2012-32/opt
|
||||
|
|
@ -138,14 +126,11 @@ jobs:
|
|||
worker:
|
||||
env:
|
||||
CHANNEL:
|
||||
by-project:
|
||||
birch: "release-localtest"
|
||||
jamun: "beta-localtest"
|
||||
maple: "beta-localtest"
|
||||
mozilla-beta: "beta-localtest"
|
||||
mozilla-release: "release-localtest"
|
||||
mozilla-esr60: "esr-localtest"
|
||||
default: "default"
|
||||
by-release-type:
|
||||
beta: "beta-localtest"
|
||||
release(-rc)?: "release-localtest"
|
||||
esr60: "esr-localtest"
|
||||
nightly: "nightly"
|
||||
treeherder:
|
||||
symbol: UV(UV)
|
||||
platform: osx-cross/opt
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ Release Promotion
|
|||
Specify the next version for version bump tasks.
|
||||
|
||||
``release_type``
|
||||
The type of release being promoted. One of "beta", "devedition", "esr", "rc", or "release".
|
||||
The type of release being promoted. One of "nightly", "beta", "esr60", "release-rc", or "release".
|
||||
|
||||
``release_eta``
|
||||
The time and date when a release is scheduled to live. This value is passed to Balrog.
|
||||
|
|
|
|||
|
|
@ -279,7 +279,8 @@ def release_promotion_action(parameters, graph_config, input, task_group_id, tas
|
|||
parameters['build_number'] = int(input['build_number'])
|
||||
parameters['next_version'] = next_version
|
||||
parameters['release_history'] = release_history
|
||||
parameters['release_type'] = promotion_config.get('release-type', '')
|
||||
if promotion_config.get('is-rc'):
|
||||
parameters['release_type'] += '-rc'
|
||||
parameters['release_eta'] = input.get('release_eta', '')
|
||||
parameters['release_enable_partners'] = release_enable_partners
|
||||
parameters['release_partners'] = input.get('release_partners')
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ graph_config_schema = Schema({
|
|||
Required('flavors'): {basestring: {
|
||||
Required('product'): basestring,
|
||||
Required('target-tasks-method'): basestring,
|
||||
Optional('release-type'): basestring,
|
||||
Optional('is-rc'): bool,
|
||||
Optional('rebuild-kinds'): [basestring],
|
||||
Optional('version-bump'): bool,
|
||||
Optional('partial-updates'): bool,
|
||||
|
|
|
|||
|
|
@ -68,30 +68,35 @@ PER_PROJECT_PARAMETERS = {
|
|||
'target_tasks_method': 'mozilla_beta_tasks',
|
||||
'optimize_target_tasks': True,
|
||||
'include_nightly': True,
|
||||
'release_type': 'beta',
|
||||
},
|
||||
|
||||
'mozilla-release': {
|
||||
'target_tasks_method': 'mozilla_release_tasks',
|
||||
'optimize_target_tasks': True,
|
||||
'include_nightly': True,
|
||||
'release_type': 'release',
|
||||
},
|
||||
|
||||
'mozilla-esr60': {
|
||||
'target_tasks_method': 'mozilla_esr60_tasks',
|
||||
'optimize_target_tasks': True,
|
||||
'include_nightly': True,
|
||||
'release_type': 'esr60',
|
||||
},
|
||||
|
||||
'comm-beta': {
|
||||
'target_tasks_method': 'mozilla_beta_tasks',
|
||||
'optimize_target_tasks': True,
|
||||
'include_nightly': True,
|
||||
'release_type': 'beta',
|
||||
},
|
||||
|
||||
'comm-esr60': {
|
||||
'target_tasks_method': 'mozilla_esr60_tasks',
|
||||
'optimize_target_tasks': True,
|
||||
'include_nightly': True,
|
||||
'release_type': 'release',
|
||||
},
|
||||
|
||||
'pine': {
|
||||
|
|
@ -216,7 +221,7 @@ def get_decision_parameters(options):
|
|||
parameters['version'] = get_version()
|
||||
parameters['app_version'] = get_app_version()
|
||||
parameters['next_version'] = None
|
||||
parameters['release_type'] = ''
|
||||
parameters['release_type'] = 'nightly'
|
||||
parameters['release_eta'] = ''
|
||||
parameters['release_enable_partners'] = False
|
||||
parameters['release_partners'] = []
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ PARAMETERS = {
|
|||
'release_partners': None,
|
||||
'release_partner_config': None,
|
||||
'release_partner_build_number': 1,
|
||||
'release_type': '',
|
||||
'release_type': 'nightly',
|
||||
'release_product': None,
|
||||
'target_tasks_method': 'default',
|
||||
'try_mode': None,
|
||||
|
|
|
|||
|
|
@ -328,7 +328,7 @@ def target_tasks_promote_desktop(full_task_graph, parameters, graph_config):
|
|||
return True
|
||||
|
||||
# 'secondary' balrog/update verify/final verify tasks only run for RCs
|
||||
if parameters.get('release_type') != 'rc':
|
||||
if parameters.get('release_type') != 'release-rc':
|
||||
if 'secondary' in task.kind:
|
||||
return False
|
||||
|
||||
|
|
@ -361,7 +361,7 @@ def target_tasks_push_desktop(full_task_graph, parameters, graph_config):
|
|||
def target_tasks_ship_desktop(full_task_graph, parameters, graph_config):
|
||||
"""Select the set of tasks required to ship desktop.
|
||||
Previous build deps will be optimized out via action task."""
|
||||
is_rc = (parameters.get('release_type') == 'rc')
|
||||
is_rc = (parameters.get('release_type') == 'release-rc')
|
||||
if is_rc:
|
||||
# ship_firefox_rc runs after `promote` rather than `push`; include
|
||||
# all promote tasks.
|
||||
|
|
@ -417,7 +417,7 @@ def target_tasks_promote_fennec(full_task_graph, parameters, graph_config):
|
|||
def target_tasks_ship_fennec(full_task_graph, parameters, graph_config):
|
||||
"""Select the set of tasks required to ship fennec.
|
||||
Previous build deps will be optimized out via action task."""
|
||||
is_rc = (parameters.get('release_type') == 'rc')
|
||||
is_rc = (parameters.get('release_type') == 'release-rc')
|
||||
filtered_for_candidates = target_tasks_promote_fennec(
|
||||
full_task_graph, parameters, graph_config,
|
||||
)
|
||||
|
|
|
|||
|
|
@ -137,12 +137,7 @@ def make_task_worker(config, jobs):
|
|||
del job['bouncer-products']
|
||||
|
||||
if job['worker']['entries']:
|
||||
# XXX Because rc jobs are defined within the same kind, we need to delete the
|
||||
# firefox-rc job at this stage, if we're not building an RC. Otherwise, even if
|
||||
# target_tasks.py filters out the rc job, it gets resurected by any kind that depends
|
||||
# on the release-bouncer-sub one (release-notify-promote as of time of this writing).
|
||||
if config.params['release_type'] == 'rc' or job['name'] != 'firefox-rc':
|
||||
yield job
|
||||
yield job
|
||||
else:
|
||||
logger.warn('No bouncer entries defined in bouncer submission task for "{}". \
|
||||
Job deleted.'.format(job['name']))
|
||||
|
|
|
|||
|
|
@ -90,14 +90,9 @@ def make_task_description(config, jobs):
|
|||
job, job['dependencies']
|
||||
)
|
||||
|
||||
# Use the rc-google-play-track and rc-rollout-percentage in RC relpro flavors
|
||||
if config.params['release_type'] == 'rc':
|
||||
job['worker']['google-play-track'] = job['worker']['rc-google-play-track']
|
||||
job['worker']['rollout-percentage'] = job['worker']['rc-rollout-percentage']
|
||||
|
||||
resolve_keyed_by(
|
||||
job, 'worker.google-play-track', item_name=job['name'],
|
||||
project=config.params['project']
|
||||
**{'release-type': config.params['release_type']}
|
||||
)
|
||||
resolve_keyed_by(
|
||||
job, 'worker.commit', item_name=job['name'],
|
||||
|
|
@ -106,7 +101,7 @@ def make_task_description(config, jobs):
|
|||
|
||||
resolve_keyed_by(
|
||||
job, 'worker.rollout-percentage', item_name=job['name'],
|
||||
project=config.params['project']
|
||||
**{'release-type': config.params['release_type']}
|
||||
)
|
||||
|
||||
job['scopes'] = [get_push_apk_scope(config)]
|
||||
|
|
@ -158,8 +153,4 @@ def delete_non_required_fields(_, jobs):
|
|||
for job in jobs:
|
||||
del job['name']
|
||||
del job['dependent-tasks']
|
||||
|
||||
del(job['worker']['rc-google-play-track'])
|
||||
del(job['worker']['rc-rollout-percentage'])
|
||||
|
||||
yield job
|
||||
|
|
|
|||
|
|
@ -0,0 +1,22 @@
|
|||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
"""
|
||||
Transforms for release tasks
|
||||
"""
|
||||
|
||||
from __future__ import absolute_import, print_function, unicode_literals
|
||||
|
||||
|
||||
def run_on_releases(config, jobs):
|
||||
"""
|
||||
Filter out jobs with `run-on-releases` set, and that don't match the
|
||||
`release_type` paramater.
|
||||
"""
|
||||
for job in jobs:
|
||||
release_type = config.params['release_type']
|
||||
run_on_release_types = job.pop('run-on-releases', None)
|
||||
|
||||
if run_on_release_types is None or release_type in run_on_release_types:
|
||||
yield job
|
||||
|
|
@ -543,10 +543,11 @@ task_description_schema = Schema({
|
|||
Optional('product'): basestring,
|
||||
Optional('platforms'): [basestring],
|
||||
Optional('release-eta'): basestring,
|
||||
Optional('channel-names'): optionally_keyed_by('project', [basestring]),
|
||||
Optional('channel-names'): optionally_keyed_by('release-type', [basestring]),
|
||||
Optional('require-mirrors'): bool,
|
||||
Optional('publish-rules'): optionally_keyed_by('project', [int]),
|
||||
Optional('rules-to-update'): optionally_keyed_by('project', [basestring]),
|
||||
Optional('publish-rules'): optionally_keyed_by('release-type', 'release-level', [int]),
|
||||
Optional('rules-to-update'): optionally_keyed_by(
|
||||
'release-type', 'release-level', [basestring]),
|
||||
Optional('archive-domain'): optionally_keyed_by('release-level', basestring),
|
||||
Optional('download-domain'): optionally_keyed_by('release-level', basestring),
|
||||
Optional('blob-suffix'): basestring,
|
||||
|
|
@ -1159,7 +1160,7 @@ def build_balrog_payload(config, task, task_def):
|
|||
resolve_keyed_by(
|
||||
worker, prop, task['description'],
|
||||
**{
|
||||
'project': config.params['project'],
|
||||
'release-type': config.params['release_type'],
|
||||
'release-level': config.params.release_level(),
|
||||
}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -43,7 +43,13 @@ def add_command(config, tasks):
|
|||
]
|
||||
for thing in ("CHANNEL", "VERIFY_CONFIG", "BUILD_TOOLS_REPO"):
|
||||
thing = "worker.env.{}".format(thing)
|
||||
resolve_keyed_by(chunked, thing, thing, **config.params)
|
||||
resolve_keyed_by(
|
||||
chunked, thing, thing,
|
||||
**{
|
||||
'project': config.params['project'],
|
||||
'release-type': config.params['release_type'],
|
||||
}
|
||||
)
|
||||
|
||||
update_verify_config = None
|
||||
for upstream in chunked.get("dependencies", {}).keys():
|
||||
|
|
|
|||
|
|
@ -97,7 +97,6 @@ def add_command(config, tasks):
|
|||
resolve_keyed_by(
|
||||
task, thing,
|
||||
item_name=task['name'],
|
||||
project=config.params['project'],
|
||||
platform=task['attributes']['build_platform'],
|
||||
**{
|
||||
'release-type': config.params['release_type'],
|
||||
|
|
|
|||
|
|
@ -202,6 +202,13 @@ this.AppConstants = Object.freeze({
|
|||
false,
|
||||
#endif
|
||||
|
||||
ASAN_REPORTER:
|
||||
#ifdef MOZ_ASAN_REPORTER
|
||||
true,
|
||||
#else
|
||||
false,
|
||||
#endif
|
||||
|
||||
MOZ_GRAPHENE:
|
||||
#ifdef MOZ_GRAPHENE
|
||||
true,
|
||||
|
|
|
|||
|
|
@ -149,7 +149,7 @@ asm(".text\n\t"
|
|||
"push %ecx\n\t"
|
||||
"movl 8(%ebp), %eax\n\t"
|
||||
"push %eax\n\t"
|
||||
"call _PrepareAndDispatch@16\n\t"
|
||||
"call \"_PrepareAndDispatch@16\"\n\t"
|
||||
"mov 4(%ebp), %edx\n\t"
|
||||
"mov -4(%ebp), %ecx\n\t"
|
||||
"add $8, %ecx\n\t"
|
||||
|
|
@ -165,21 +165,21 @@ asm(".text\n\t" \
|
|||
".if " #n " < 10\n\t" \
|
||||
".globl __ZN14nsXPTCStubBase5Stub" #n "Ev@4\n\t" \
|
||||
".def __ZN14nsXPTCStubBase5Stub" #n "Ev@4; \n\t" \
|
||||
".scl 3\n\t" \
|
||||
".scl 2\n\t" \
|
||||
".type 46\n\t" \
|
||||
".endef\n\t" \
|
||||
"__ZN14nsXPTCStubBase5Stub" #n "Ev@4:\n\t" \
|
||||
".elseif " #n " < 100\n\t" \
|
||||
".globl __ZN14nsXPTCStubBase6Stub" #n "Ev@4\n\t" \
|
||||
".def __ZN14nsXPTCStubBase6Stub" #n "Ev@4\n\t" \
|
||||
".scl 3\n\t" \
|
||||
".scl 2\n\t" \
|
||||
".type 46\n\t" \
|
||||
".endef\n\t" \
|
||||
"__ZN14nsXPTCStubBase6Stub" #n "Ev@4:\n\t" \
|
||||
".elseif " #n " < 1000\n\t" \
|
||||
".globl __ZN14nsXPTCStubBase7Stub" #n "Ev@4\n\t" \
|
||||
".def __ZN14nsXPTCStubBase7Stub" #n "Ev@4\n\t" \
|
||||
".scl 3\n\t" \
|
||||
".scl 2\n\t" \
|
||||
".type 46\n\t" \
|
||||
".endef\n\t" \
|
||||
"__ZN14nsXPTCStubBase7Stub" #n "Ev@4:\n\t" \
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче