зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1501878 - drop complete mar from repackage-signing. r=tomprince
We want to defer mar-signing to the second half of the promote phase, but we want to keep Windows repackaged exe signing in the first half of the promote phase. This means we need to stop signing the complete MAR in repackage-signing, and defer it to another kind. Differential Revision: https://phabricator.services.mozilla.com/D11730 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
8c4a140eee
Коммит
eb8512553d
|
@ -26,8 +26,8 @@ kind-dependencies:
|
|||
- repackage-signing-msi
|
||||
|
||||
primary-dependency:
|
||||
- repackage-signing-l10n
|
||||
- repackage-signing
|
||||
- repackage
|
||||
- repackage-l10n
|
||||
|
||||
only-for-build-platforms:
|
||||
- linux-nightly/opt
|
||||
|
|
|
@ -14,13 +14,6 @@ kind-dependencies:
|
|||
- repackage-l10n
|
||||
|
||||
only-for-build-platforms:
|
||||
- linux-nightly/opt
|
||||
- linux-devedition-nightly/opt
|
||||
- linux64-nightly/opt
|
||||
- linux64-devedition-nightly/opt
|
||||
- linux64-asan-reporter-nightly/opt
|
||||
- macosx64-nightly/opt
|
||||
- macosx64-devedition-nightly/opt
|
||||
- win32-nightly/opt
|
||||
- win32-devedition-nightly/opt
|
||||
- win32/opt
|
||||
|
|
|
@ -14,13 +14,6 @@ kind-dependencies:
|
|||
- repackage
|
||||
|
||||
only-for-build-platforms:
|
||||
- linux-nightly/opt
|
||||
- linux-devedition-nightly/opt
|
||||
- linux64-nightly/opt
|
||||
- linux64-devedition-nightly/opt
|
||||
- linux64-asan-reporter-nightly/opt
|
||||
- macosx64-nightly/opt
|
||||
- macosx64-devedition-nightly/opt
|
||||
- win32-nightly/opt
|
||||
- win32-devedition-nightly/opt
|
||||
- win32/opt
|
||||
|
|
|
@ -129,8 +129,6 @@ UPSTREAM_ARTIFACT_REPACKAGE_PATHS = [
|
|||
# with a beetmover patch in https://github.com/mozilla-releng/beetmoverscript/.
|
||||
# See example in bug 1348286
|
||||
UPSTREAM_ARTIFACT_SIGNED_REPACKAGE_PATHS = [
|
||||
'target.complete.mar',
|
||||
'target.bz2.complete.mar',
|
||||
'target.installer.exe',
|
||||
'target.stub-installer.exe',
|
||||
]
|
||||
|
@ -197,7 +195,6 @@ def make_task_description(config, jobs):
|
|||
|
||||
upstream_deps = job['dependent-tasks']
|
||||
|
||||
# TODO fix the upstreamArtifact generation to not need this?
|
||||
signing_name = "build-signing"
|
||||
build_name = "build"
|
||||
repackage_name = "repackage"
|
||||
|
@ -211,13 +208,14 @@ def make_task_description(config, jobs):
|
|||
dependencies = {
|
||||
"build": upstream_deps[build_name],
|
||||
"repackage": upstream_deps[repackage_name],
|
||||
"repackage-signing": upstream_deps[repackage_signing_name],
|
||||
"signing": upstream_deps[signing_name],
|
||||
}
|
||||
if 'partials-signing' in upstream_deps:
|
||||
dependencies['partials-signing'] = upstream_deps['partials-signing']
|
||||
if msi_signing_name in upstream_deps:
|
||||
dependencies[msi_signing_name] = upstream_deps[msi_signing_name]
|
||||
if repackage_signing_name in upstream_deps:
|
||||
dependencies["repackage-signing"] = upstream_deps[repackage_signing_name]
|
||||
|
||||
attributes = copy_attributes_from_dependent_job(dep_job)
|
||||
if job.get('locale'):
|
||||
|
|
|
@ -33,8 +33,6 @@ repackage_signing_description_schema = schema.extend({
|
|||
})
|
||||
|
||||
SIGNING_FORMATS = {
|
||||
'target.complete.mar': ["autograph_hash_only_mar384"],
|
||||
'target.bz2.complete.mar': ["mar"],
|
||||
"target.installer.exe": ["sha2signcode"],
|
||||
"target.stub-installer.exe": ["sha2signcodestub"],
|
||||
"target.installer.msi": ["sha2signcode"],
|
||||
|
|
Загрузка…
Ссылка в новой задаче