Skip to content

Commit 8fb9db5

Browse files
authored
chore: only sign when doing a PR release, otherwise notarizeAndSign COMPASS-9286 (#6877)
* only sign when doing a dev release * requester expansion rather
1 parent a4b1309 commit 8fb9db5

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

.evergreen/functions.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ variables:
5353
MONGODB_RUNNER_LOG_DIR: ${workdir}/src/.testserver/
5454
DOCKERHUB_USERNAME: ${dockerhub_username}
5555
DOCKERHUB_PASSWORD: ${dockerhub_password}
56+
REQUESTER: ${requester}
5657
- &compass-e2e-secrets
5758
E2E_TESTS_METRICS_URI: ${e2e_tests_metrics_string}
5859
E2E_TESTS_ATLAS_HOST: ${e2e_tests_atlas_host}
@@ -421,7 +422,8 @@ functions:
421422
params:
422423
working_dir: src
423424
shell: bash
424-
include_expansions_in_env: [AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_SESSION_TOKEN]
425+
include_expansions_in_env:
426+
[AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_SESSION_TOKEN]
425427
env:
426428
ARTIFACTORY_USERNAME: ${artifactory_username}
427429
ARTIFACTORY_PASSWORD: ${artifactory_password}
@@ -506,7 +508,7 @@ functions:
506508
publish:
507509
- command: ec2.assume_role
508510
params:
509-
role_arn: "arn:aws:iam::119629040606:role/s3-access.cdn-origin-compass"
511+
role_arn: 'arn:aws:iam::119629040606:role/s3-access.cdn-origin-compass'
510512
- command: shell.exec
511513
params:
512514
working_dir: src
@@ -661,7 +663,7 @@ functions:
661663
- command: github.generate_token
662664
params:
663665
expansion_name: generated_token
664-
permissions: # optional
666+
permissions: # optional
665667
actions: write
666668
- command: shell.exec
667669
# Fail the task if it's idle for 10 mins

packages/hadron-build/lib/mac-notary-service.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ async function notarize(src, notarizeOptions) {
6767
'-t',
6868
'app',
6969
'-m',
70-
'notarizeAndSign',
70+
process.env.REQUESTER === 'github_pr' ? 'sign' : 'notarizeAndSign',
7171
'-u',
7272
process.env.MACOS_NOTARY_API_URL,
7373
'-b',

0 commit comments

Comments
 (0)