ci: Properly find Windows codesign certificate

electron · Dec 24, 2018 · 346742b · 346742b
1 parent aefe273
commit 346742b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -12,8 +12,6 @@ install:
         $filename = Convert-Path .\cert.p12
         $bytes = [Convert]::FromBase64String($env:WINDOWS_CERTIFICATE_P12)
         [IO.File]::WriteAllBytes($filename, $bytes)
-
-        $env:WINDOWS_CERTIFICATE_FILE = $filename
       }
   - ps: Install-Product node $env:nodejs_version x64
   - node --version

diff --git a/forge.config.js b/forge.config.js
@@ -1,6 +1,7 @@
 /* tslint:disable */
 
 const path = require('path')
+const fs = require('fs')
 const packageJson = require('./package.json')
 
 const { version } = packageJson
@@ -39,6 +40,14 @@ module.exports = {
       name: '@electron-forge/maker-squirrel',
       platforms: ['win32'],
       config: (arch) => {
+        const certificateFile = process.env.CI
+          ? path.join(__dirname, 'cert.p12')
+          : process.env.WINDOWS_CERTIFICATE_FILE;
+
+        if (!certificateFile || !fs.existsSync(certificateFile)) {
+          console.warn(`Warning: Could not find certificate file at ${certificateFile}`)
+        }
+
         return {
           name: 'electron-fiddle',
           authors: 'Electron Community',
@@ -49,8 +58,8 @@ module.exports = {
           remoteReleases: '',
           setupExe: `electron-fiddle-${version}-${arch}-setup.exe`,
           setupIcon: path.resolve(iconDir, 'fiddle.ico'),
-          certificateFile: process.env.WINDOWS_CERTIFICATE_FILE,
-          certificatePassword: process.env.WINDOWS_CERTIFICATE_PASSWORD
+          certificatePassword: process.env.WINDOWS_CERTIFICATE_PASSWORD,
+          certificateFile
         }
       }
     },