Skip to content

Commit 74ba7db

Browse files
Merge pull request #140 from electron/fix-cert-file
ci: Properly find Windows codesign certificate
2 parents aefe273 + 0fced3a commit 74ba7db

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

appveyor.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@ init:
88
install:
99
# Setup the code signing certificate
1010
- ps: >-
11-
if (Test-Path $env:WINDOWS_CERTIFICATE_P12) {
12-
$filename = Convert-Path .\cert.p12
11+
if (Test-Path Env:\WINDOWS_CERTIFICATE_P12) {
12+
$workingDirectory = Convert-Path (Resolve-Path -path ".")
13+
$filename = "$workingDirectory\cert.p12"
1314
$bytes = [Convert]::FromBase64String($env:WINDOWS_CERTIFICATE_P12)
1415
[IO.File]::WriteAllBytes($filename, $bytes)
15-
16-
$env:WINDOWS_CERTIFICATE_FILE = $filename
1716
}
1817
- ps: Install-Product node $env:nodejs_version x64
1918
- node --version

forge.config.js

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/* tslint:disable */
22

33
const path = require('path')
4+
const fs = require('fs')
45
const packageJson = require('./package.json')
56

67
const { version } = packageJson
@@ -39,6 +40,14 @@ module.exports = {
3940
name: '@electron-forge/maker-squirrel',
4041
platforms: ['win32'],
4142
config: (arch) => {
43+
const certificateFile = process.env.CI
44+
? path.join(__dirname, 'cert.p12')
45+
: process.env.WINDOWS_CERTIFICATE_FILE;
46+
47+
if (!certificateFile || !fs.existsSync(certificateFile)) {
48+
console.warn(`Warning: Could not find certificate file at ${certificateFile}`)
49+
}
50+
4251
return {
4352
name: 'electron-fiddle',
4453
authors: 'Electron Community',
@@ -49,8 +58,8 @@ module.exports = {
4958
remoteReleases: '',
5059
setupExe: `electron-fiddle-${version}-${arch}-setup.exe`,
5160
setupIcon: path.resolve(iconDir, 'fiddle.ico'),
52-
certificateFile: process.env.WINDOWS_CERTIFICATE_FILE,
53-
certificatePassword: process.env.WINDOWS_CERTIFICATE_PASSWORD
61+
certificatePassword: process.env.WINDOWS_CERTIFICATE_PASSWORD,
62+
certificateFile
5463
}
5564
}
5665
},

0 commit comments

Comments
 (0)