Skip to content

Commit 1922f04

Browse files
committed
add should sign and make code-signing conditional
1 parent 65a9fd3 commit 1922f04

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

script/vsts/get-release-version.js

+4
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ async function getReleaseVersion() {
7878
buildBranch.startsWith('electron-') ||
7979
(buildBranch === 'master' &&
8080
!process.env.SYSTEM_PULLREQUEST_PULLREQUESTNUMBER));
81+
const SHOULD_SIGN = process.env.SHOULD_SIGN;
8182

8283
console.log(
8384
`##vso[task.setvariable variable=AppName;isOutput=true]${getAppName(
@@ -90,6 +91,9 @@ async function getReleaseVersion() {
9091
console.log(
9192
`##vso[task.setvariable variable=IsSignedZipBranch;isOutput=true]${isSignedZipBranch}`
9293
);
94+
console.log(
95+
`##vso[task.setvariable variable=SHOULD_SIGN;isOutput=true]${SHOULD_SIGN}`
96+
);
9397
}
9498

9599
getReleaseVersion();

script/vsts/platforms/macos.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
displayName: Run linter
4848

4949
- script: |
50-
if [ $IS_RELEASE_BRANCH == "true" ] || [ $IS_SIGNED_ZIP_BRANCH == "true" ]; then
50+
if [ $SHOULD_SIGN == "true" ] && ([ $IS_RELEASE_BRANCH == "true" ] || [ $IS_SIGNED_ZIP_BRANCH == "true" ]); then
5151
script/build --no-bootstrap --code-sign --compress-artifacts
5252
else
5353
script/build --no-bootstrap --compress-artifacts

script/vsts/platforms/windows.yml

+9-1
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,19 @@ jobs:
101101
SET SQUIRREL_TEMP=C:\tmp
102102
IF [%IS_RELEASE_BRANCH%]==[true] (
103103
ECHO Creating production artifacts for release branch %BUILD_SOURCEBRANCHNAME%
104-
node script\vsts\windows-run.js script\build.cmd --no-bootstrap --code-sign --compress-artifacts --create-windows-installer
104+
IF [%SHOULD_SIGN%]==[true] (
105+
node script\vsts\windows-run.js script\build.cmd --no-bootstrap --code-sign --compress-artifacts --create-windows-installer
106+
) ELSE (
107+
node script\vsts\windows-run.js script\build.cmd --no-bootstrap --compress-artifacts --create-windows-installer
108+
)
105109
) ELSE (
106110
IF [%IS_SIGNED_ZIP_BRANCH%]==[true] (
107111
ECHO Creating signed CI artifacts for branch %BUILD_SOURCEBRANCHNAME%
112+
IF [%SHOULD_SIGN%]==[true] (
108113
node script\vsts\windows-run.js script\build.cmd --no-bootstrap --code-sign --compress-artifacts
114+
) ELSE (
115+
node script\vsts\windows-run.js script\build.cmd --no-bootstrap --compress-artifacts
116+
)
109117
) ELSE (
110118
ECHO Pull request build, no code signing will be performed
111119
node script\vsts\windows-run.js script\build.cmd --no-bootstrap --compress-artifacts

0 commit comments

Comments
 (0)