Merge pull request #197 from LLK/csc-gz

Fix automated builds

.circleci/config.yml

@@ -61,17 +61,20 @@ jobs:
                   }
                   decodeToFile embedded.provisionprofile "${MAC_PROVISION_PROFILE}"
                   decodeToFile mas-dev.provisionprofile "${MAC_DEV_PROVISION_PROFILE}"
-                  decodeToFile macos-certs-scratch-foundation.p12 "${CSC_MACOS}"
+                  decodeToFile macos-certs-scratch-foundation.p12.gz "${CSC_MACOS_GZ}"
+                  decodeToFile apple-dev-cert.p12 "${MAC_DEV_CERT}"
+                  gunzip macos-certs-scratch-foundation.p12.gz
                   security -v create-keychain -p circleci circleci.keychain
                   security -v default-keychain -s circleci.keychain
                   security -v import macos-certs-scratch-foundation.p12 -k circleci.keychain -P "${CSC_MACOS_PASSWORD}" -T /usr/bin/codesign -T /usr/bin/productbuild
+                  security -v import apple-dev-cert.p12 -k circleci.keychain -P "${MAC_DEV_CERT_PASSWORD}" -T /usr/bin/codesign -T /usr/bin/productbuild
                   security -v unlock-keychain -p circleci circleci.keychain
                   # "set-key-partition-list" prints extensive not-so-useful output and adding "-q" (even multiple times) doesn't suppress it.
                   # The "grep -v" at the end of this line suppresses all of that so any errors or warnings might be more visible.
                   security -v set-key-partition-list -S apple-tool:,apple:,codesign: -s -k circleci circleci.keychain | grep -v '^    0x'
                   security -v set-keychain-settings -lut 600 circleci.keychain
                   security -v find-identity circleci.keychain
-                  rm macos-certs-scratch-foundation.p12
+                  rm macos-certs-scratch-foundation.p12 apple-dev-cert.p12
       - restore_cache:
           # Caching Homebrew's files (see the save_cache step below) means that Homebrew doesn't have to update as
           # much. The Homebrew update can take several minutes without this, but with the cache it tends to take less
@@ -87,6 +90,9 @@ jobs:
             git -C ~/app-builder checkout b85740334fec875f5dd8dcd22eb1f729599109db
             make --directory=~/app-builder build
             ln -sfv ~/app-builder/dist/app-builder_darwin_amd64/app-builder ./node_modules/app-builder-bin/mac/
+      - run:
+          name: Upgrade to Node 14
+          command: brew install node@14
       - save_cache:
           name: Save Homebrew cache
           paths:
@@ -132,6 +138,12 @@ jobs:
             echo 'Adding libexec/git-core to PATH...'
             echo 'For more details see https://github.com/appveyor/ci/issues/2420'
             echo 'export PATH="$PATH:/c/Program Files/Git/mingw64/libexec/git-core"' >> $BASH_ENV
+      - run:
+          # nvm for Windows doesn't accept partial version numbers, so specify exact :(
+          name: Upgrade to Node 14.17.0
+          command: |
+            nvm install 14.17.0
+            nvm use 14.17.0
       - checkout
       - npm_install:
           npmCacheDir: "C:/Users/circleci/AppData/Roaming/npm-cache"

package.json

@@ -40,7 +40,7 @@
     "babel-plugin-react-intl": "^7.5.7",
     "copy-webpack-plugin": "^5.1.1",
     "electron": "^8.2.5",
-    "electron-builder": "^22.6.0",
+    "electron-builder": "^22.11.5",
     "electron-devtools-installer": "^3.0.0",
     "electron-notarize": "^0.3.0",
     "electron-store": "^5.1.1",