Skip to content

Commit 5a334ab

Browse files
Use dotenv
1 parent aacfae7 commit 5a334ab

File tree

4 files changed

+4343
-5064
lines changed

4 files changed

+4343
-5064
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@ dist
99
!.github/images
1010
*.code-workspace
1111
*.pfx
12+
Microsoft.Trusted.Signing.Client*
13+
trusted-signing-metadata.json
14+
.env

forge.config.js

+30-8
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,25 @@ const path = require('path');
22
const fs = require('fs');
33
const package = require('./package.json');
44

5-
if (process.env['WINDOWS_CODESIGN_FILE']) {
6-
const certPath = path.join(__dirname, 'win-certificate.pfx');
7-
const certExists = fs.existsSync(certPath);
5+
require('dotenv').config()
86

9-
if (certExists) {
10-
process.env['WINDOWS_CODESIGN_FILE'] = certPath;
11-
}
7+
process.env.TEMP = process.env.TMP = `C:\\Users\\FelixRieseberg\\AppData\\Local\\Temp`
8+
9+
const FLAGS = {
10+
SIGNTOOL_PATH: process.env.SIGNTOOL_PATH,
11+
AZURE_CODE_SIGNING_DLIB: process.env.AZURE_CODE_SIGNING_DLIB || path.resolve(__dirname, 'Microsoft.Trusted.Signing.Client.1.0.60', 'bin', 'x64', 'Azure.CodeSigning.Dlib.dll'),
12+
AZURE_METADATA_JSON: process.env.AZURE_METADATA_JSON || path.resolve(__dirname, 'trusted-signing-metadata.json'),
13+
AZURE_TENANT_ID: process.env.AZURE_TENANT_ID,
14+
AZURE_CLIENT_ID: process.env.AZURE_CLIENT_ID,
15+
AZURE_CLIENT_SECRET: process.env.AZURE_CLIENT_SECRET,
1216
}
1317

18+
fs.writeFileSync(FLAGS.AZURE_METADATA_JSON, JSON.stringify({
19+
Endpoint: process.env.AZURE_CODE_SIGNING_ENDPOINT || "https://wcus.codesigning.azure.net",
20+
CodeSigningAccountName: process.env.AZURE_CODE_SIGNING_ACCOUNT_NAME,
21+
CertificateProfileName: process.env.AZURE_CODE_SIGNING_CERTIFICATE_PROFILE_NAME,
22+
}, null, 2));
23+
1424
module.exports = {
1525
hooks: {
1626
generateAssets: require('./tools/generateAssets'),
@@ -32,6 +42,12 @@ module.exports = {
3242
appleIdPassword: process.env['APPLE_ID_PASSWORD'],
3343
teamId: 'LT94ZKYDCJ'
3444
},
45+
windowsSign: {
46+
signToolPath: FLAGS.SIGNTOOL_PATH,
47+
signWithParams: `/v /dlib ${process.env.AZURE_CODE_SIGNING_DLIB} /dmdf ${FLAGS.AZURE_METADATA_JSON}`,
48+
timestampServer: "http://timestamp.acs.microsoft.com",
49+
hashes: ["sha256"],
50+
},
3551
ignore: [
3652
/\/assets(\/?)/,
3753
/\/docs(\/?)/,
@@ -55,6 +71,8 @@ module.exports = {
5571
/\.eslintignore/,
5672
/\.eslintrc/,
5773
/\.prettierrc/,
74+
/\/Microsoft\.Trusted\.Signing\.Client.*/,
75+
/\/trusted-signing-metadata/,
5876
]
5977
},
6078
makers: [
@@ -72,8 +90,12 @@ module.exports = {
7290
loadingGif: './assets/boot.gif',
7391
setupExe: `windows95-${package.version}-setup-${arch}.exe`,
7492
setupIcon: path.resolve(__dirname, 'assets', 'icon.ico'),
75-
certificateFile: process.env['WINDOWS_CODESIGN_FILE'],
76-
certificatePassword: process.env['WINDOWS_CODESIGN_PASSWORD'],
93+
windowsSign: {
94+
signToolPath: FLAGS.SIGNTOOL_PATH,
95+
signWithParams: `/v /dlib ${process.env.AZURE_CODE_SIGNING_DLIB} /dmdf ${FLAGS.AZURE_METADATA_JSON}`,
96+
timestampServer: "http://timestamp.acs.microsoft.com",
97+
hashes: ["sha256"],
98+
}
7799
}
78100
}
79101
},

0 commit comments

Comments
 (0)