diff --git a/CHANGELOG.md b/CHANGELOG.md index b381718c..7a52c5fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ The format is loosely based on [Keep a Changelog](http://keepachangelog.com/en/1 Every Agent version includes the most recent firmware version. See the [firmware changelog](https://github.com/UltimateHackingKeyboard/firmware/blob/master/CHANGELOG.md). -## [1.1.1] - 2017-02-13 +## [1.1.1] - 2018-02-13 Firmware: 8.1.**2** [[release](https://github.com/UltimateHackingKeyboard/firmware/releases/tag/v8.1.2)] | Device Protocol: 4.2.0 | User Config: 4.0.0 | Hardware Config: 1.0.0 @@ -20,7 +20,7 @@ Firmware: 8.1.**2** [[release](https://github.com/UltimateHackingKeyboard/firmwa - Assign "switch to test keymap" action on all keymaps in the default configuration. - Add keymap descriptions in the default configuration. -## [1.1.0] - 2017-01-15 +## [1.1.0] - 2018-01-15 Firmware: 8.**1**.0 [[release](https://github.com/UltimateHackingKeyboard/firmware/releases/tag/v8.1.0)] | Device Protocol: 4.2.0 | User Config: 4.0.0 | Hardware Config: 1.0.0 diff --git a/package.json b/package.json index d46dfff3..8b533275 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "private": true, "author": "Ultimate Gadget Laboratories", "main": "electron/dist/electron-main.js", - "version": "1.1.1", + "version": "1.1.2", "firmwareVersion": "8.1.2", "deviceProtocolVersion": "4.2.0", "userConfigVersion": "4.0.0", diff --git a/scripts/certs/.gitignore b/scripts/certs/.gitignore new file mode 100644 index 00000000..f1e6fa8b --- /dev/null +++ b/scripts/certs/.gitignore @@ -0,0 +1,2 @@ +windows-cert.p12 +mac-cert.p12 diff --git a/scripts/certs/mac-cert.p12.enc b/scripts/certs/mac-cert.p12.enc new file mode 100644 index 00000000..8c9ba5b9 Binary files /dev/null and b/scripts/certs/mac-cert.p12.enc differ diff --git a/scripts/release.js b/scripts/release.js index 1fa9b5aa..6d63d124 100644 --- a/scripts/release.js +++ b/scripts/release.js @@ -83,8 +83,8 @@ if (process.platform === 'darwin') { } if (process.platform === 'darwin') { - // TODO: Remove comment when macOS certificates boughted and exported - //require('./setup-macos-keychain').registerKeyChain(); + exec('openssl aes-256-cbc -K $CERT_KEY -iv $CERT_IV -in scripts/certs/mac-cert.p12.enc -out scripts/certs/mac-cert.p12 -d') + //process.env.CSC_LINK = path.join(__dirname, 'certs/mac-cert.p12'); } if (TEST_BUILD || gitTag) { diff --git a/scripts/setup-macos-keychain.js b/scripts/setup-macos-keychain.js deleted file mode 100644 index 1e369a23..00000000 --- a/scripts/setup-macos-keychain.js +++ /dev/null @@ -1,20 +0,0 @@ -'use strict' - -const cp = require('child_process') -const path = require('path') - -function registerKeyChain() { - const encryptedFile = path.join(__dirname, '../certs/developer-id-cert.p12.enc') - const decryptedFile = path.join(__dirname, '../certs/developer-id-cert.p12') - cp.execSync(`openssl aes-256-cbc -K $encrypted_04061b49eb95_key -iv $encrypted_04061b49eb95_iv -in ${encryptedFile} -out ${decryptedFile} -d`) - - const keyChain = 'mac-build.keychain' - cp.execSync(`security create-keychain -p travis ${keyChain}`) - cp.execSync(`security default-keychain -s ${keyChain}`) - cp.execSync(`security unlock-keychain -p travis ${keyChain}`) - cp.execSync(`security set-keychain-settings -t 3600 -u ${keyChain}`) - - cp.execSync(`security import ${decryptedFile} -k ${keyChain} -P $KEY_PASSWORD -T /usr/bin/codesign`) -} - -module.exports.registerKeyChain = registerKeyChain