Skip to content

Commit ec08d83

Browse files
committed
DO NOT MERGE - Test signingscript rcodesign
1 parent c94d9b5 commit ec08d83

6 files changed

Lines changed: 15 additions & 9 deletions

File tree

signing-manifests/test-mac-hardened-sign.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ bug: 0000000
33
sha256: 5b95d1a32ca449970e49d7a85a8a88294de31ec427e8b6616098b088aeea5ee7
44
filesize: 80945464
55
private-artifact: false
6-
signing-formats: ["macapp", "autograph_widevine", "autograph_omnija"]
7-
requestor: Haik Aftandilian <haftandilian@mozilla.com>
6+
signing-formats: ["macapp"]
7+
requestor: Heitor Neiva <hneiva@mozilla.com>
88
reason: Firefox hardened signing per-process entitlements
99
product: firefox
1010
artifact-name: target.dmg
11-
mac-behavior: mac_sign_and_pkg_hardened
1211
signingscript-notarization: true
12+
sign-tool: rcodesign
1313
hardened-sign-config:
1414
- deep: false
1515
runtime: true

taskcluster/adhoc_taskgraph/signing_manifest.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"autograph_hash_only_mar384",
2929
"macapp",
3030
"mac_single_file",
31-
"autograph_widevine",
31+
"autograph_widevine",
3232
"autograph_omnija",
3333
)
3434

@@ -61,6 +61,7 @@
6161
},
6262
),
6363
Required("manifest_name"): str,
64+
Optional("sign-tool"): str,
6465
Optional("mac-behavior"): str,
6566
Optional("signingscript-notarization"): bool,
6667
Optional("hardened-sign-config"): [{str: object}],

taskcluster/adhoc_taskgraph/transforms/signing.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,15 @@ def define_signing_flags(config, tasks):
3232
for f in ("macapp", "mac_single_file"):
3333
if f in task["attributes"]["manifest"]["signing-formats"]:
3434
format_ = f
35+
sign_tool = task["attributes"]["manifest"].get("sign-tool")
3536

3637
for key in ("worker-type", "worker.signing-type", "index.type"):
3738
resolve_keyed_by(
3839
task,
3940
key,
4041
item_name=task["name"],
4142
level=config.params["level"],
42-
format=format_,
43+
**{"format": format_, "sign-tool": sign_tool},
4344
)
4445
yield task
4546

taskcluster/adhoc_taskgraph/worker_types.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ def _set_task_scopes(config, worker, task_def):
4646
}
4747
],
4848
Optional("product"): str,
49+
Optional("hardened-sign-config"): [{str: object}],
4950
},
5051
)
5152
def build_scriptworker_signing_payload(config, task, task_def):

taskcluster/ci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ workers:
4444
worker-type: adhoc-t-signing
4545
signing:
4646
provisioner: scriptworker-k8s
47-
implementation: scriptworker-signing
47+
implementation: scriptworker-signing-dev
4848
os: scriptworker
4949
worker-type:
5050
by-level:

taskcluster/ci/dep-signing/kind.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,12 @@ task-template:
1919
index:
2020
type: dep-signing
2121
worker-type:
22-
by-format:
23-
mac.*: mac-signing
24-
default: dep-signing
22+
by-sign-tool:
23+
rcodesign: dep-signing
24+
default:
25+
by-format:
26+
mac.*: mac-signing
27+
default: dep-signing
2528
worker:
2629
signing-type: dep-signing
2730
max-run-time: 3600

0 commit comments

Comments
 (0)