diff --git a/.gitignore b/.gitignore index 77667e1..6161be5 100644 --- a/.gitignore +++ b/.gitignore @@ -30,7 +30,7 @@ jspm_packages/ # dotenv environment variables file .env -.env.test +.env build/app build/platform-tools diff --git a/README.md b/README.md index 228927a..1ecfb6c 100644 --- a/README.md +++ b/README.md @@ -76,3 +76,7 @@ GH_TOKEN - The github personal access token used to upload releases WIN_CSC_LINK - The base64 encoded .p12 file ( Windows Code Signing Cert ). as a string. Do not include the `-----BEGIN CERTIFICATE-----` or `-----END CERTIFICATE-----` parts just the base64 string. WIN_CSC_KEY_PASSWORD - The passphrase used when generating the .p12 file for windows. + +Edit: Windows signing no longer works without a usb dongle because fuck the signing industry. + +You'll need this on the path to build for windows locally: C:\Users\USER\AppData\Local\electron-builder\Cache\winCodeSign\winCodeSign-2.6.0\windows-10\x64 diff --git a/windows-codesign.js b/build/windows-codesign.js similarity index 92% rename from windows-codesign.js rename to build/windows-codesign.js index ba383fb..84d5048 100644 --- a/windows-codesign.js +++ b/build/windows-codesign.js @@ -18,6 +18,9 @@ async function doSign(file, hash, owner) { const debug = Debug ? '/debug' : null; let args = [ + 'cd', + '%LOCALAPPDATA%\\electron-builder\\cache\\winCodeSign\\winCodeSign-2.6.0\\windows-10\\x64\\', + '&&', 'signtool', 'sign', debug, diff --git a/package.json b/package.json index 73336fc..2747fe3 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "start:test2": "concurrently \"yarn electron-build && yarn platform-tools && wait-on http-get://localhost:4205/ && cross-env NODE_ENV=dev SQ_ENV_CFG=test2 electron .\" \"cd desktop-app && ng serve -c test2 --port 4205\"", "start:local": "concurrently \"yarn electron-build && yarn platform-tools && wait-on http-get://localhost:4205/ && cross-env NODE_ENV=dev SQ_ENV_CFG=local electron .\" \"cd desktop-app && ng serve -c local --port 4205\"", "postinstall": "electron-builder install-app-deps && cd desktop-app && yarn install", - "dist": "yarn electron-build && yarn platform-tools && yarn app-build && env-cmd -f ./.env.test electron-builder", + "dist": "yarn electron-build && yarn platform-tools && yarn app-build && env-cmd electron-builder --publish onTagOrDraft", "dist-test": "yarn electron-build && yarn platform-tools && yarn app-build-test && cross-env SQ_ENV_CFG=test electron-builder", "angular": "cd desktop-app && ng serve --port 4205", "angular:test": "cd desktop-app && ng serve -c test --port 4205", @@ -47,6 +47,7 @@ "win": { "artifactName": "${productName}-${version}-${arch}-${os}.${ext}", "sign": "./build/windows-codesign.js", + "publish": ["github"], "target": [ "nsis" ] @@ -105,6 +106,7 @@ "cross-env": "^5.2.0", "crypto": "^1.0.1", "electron-updater": "^4.3.7", + "env-cmd": "^10.1.0", "express": "^4.17.1", "extract-zip": "^1.6.7", "md5": "^2.2.1", diff --git a/yarn.lock b/yarn.lock index b84e955..c67a40f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1016,6 +1016,11 @@ commander@^2.3.0: resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== +commander@^4.0.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" + integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== + commander@^5.0.0: version "5.1.0" resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" @@ -1174,7 +1179,7 @@ cross-spawn@^6.0.0, cross-spawn@^6.0.5: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^7.0.1: +cross-spawn@^7.0.0, cross-spawn@^7.0.1: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -1525,6 +1530,14 @@ enhanced-resolve@^4.0.0: memory-fs "^0.5.0" tapable "^1.0.0" +env-cmd@^10.1.0: + version "10.1.0" + resolved "https://registry.yarnpkg.com/env-cmd/-/env-cmd-10.1.0.tgz#c7f5d3b550c9519f137fdac4dd8fb6866a8c8c4b" + integrity sha512-mMdWTT9XKN7yNth/6N6g2GuKuJTsKMDHlQFUDacb/heQRRWOTIZ42t1rMHnQu4jYxU1ajdTeJM+9eEETlqToMA== + dependencies: + commander "^4.0.0" + cross-spawn "^7.0.0" + env-paths@^2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"