Skip to content

Commit

Permalink
debug build
Browse files Browse the repository at this point in the history
  • Loading branch information
BitHighlander committed Apr 17, 2024
1 parent cbb7aa1 commit f5c8b65
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 72 deletions.
50 changes: 11 additions & 39 deletions .pnp.cjs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

2 changes: 1 addition & 1 deletion packages/keepkey-desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
}
},
"dependencies": {
"@electron/notarize": "^2.3.0",
"@ethersproject/contracts": "^5.7.0",
"@keepkey/device-protocol": "^7.10.2",
"@keepkey/hdwallet-core": "^1.53.9",
Expand Down Expand Up @@ -132,7 +133,6 @@
"web3": "^4.0.1"
},
"devDependencies": {
"@bithighlander/electron-builder-notarize": "0.0.11",
"@keepkey/common-esbuild-bits": "workspace:*",
"@shapeshiftoss/eslint-plugin-logger": "^1.1.0",
"@shapeshiftoss/hdwallet-keepkey": "^1.52.11",
Expand Down
30 changes: 29 additions & 1 deletion packages/keepkey-desktop/scripts/afterSign.js
Original file line number Diff line number Diff line change
@@ -1 +1,29 @@
module.exports = require('@bithighlander/electron-builder-notarize')
require('dotenv').config()
const { notarize } = require('@electron/notarize')

const isSet = (value) => value && value !== 'false'

// electron-build hook to be used in electron-build pipeline in the future
// ===========================================================================
// Note: for now we don't use this at the moment.
// Run ./notarize-cli.js instead
exports.default = async function notarizing (context) {
const { electronPlatformName, appOutDir } = context
if (electronPlatformName !== 'darwin') return
// skip notarization if secrets are not present in env
if (!process.env.APPLE_ID_PASSWORD || !process.env.APPLE_ID) {
console.log('Skipping notarizing, since secrets are not present in env.')
return
}

const appName = context.packager.appInfo.productFilename
const appPath = `${appOutDir}/mac-arm64/${appName}.app`; // Correct the path based on actual output directory
return notarize({
appBundleId: 'com.keepkey.desktop',
appPath,
appleId: process.env.APPLE_ID,
appleIdPassword: process.env.APPLE_ID_PASSWORD,
tool: 'notarytool',
teamId: 'DR57X8Z394'
})
}
42 changes: 14 additions & 28 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1752,21 +1752,6 @@ __metadata:
languageName: node
linkType: hard

"@bithighlander/electron-builder-notarize@npm:0.0.11":
version: 0.0.11
resolution: "@bithighlander/electron-builder-notarize@npm:0.0.11"
dependencies:
builder-util: "npm:24.13.1"
dotenv: "npm:^8.2.0"
electron-notarize: "npm:^1.2.2"
js-yaml: "npm:^3.14.0"
read-pkg-up: "npm:^7.0.0"
peerDependencies:
electron-builder: ">= 24.13.3"
checksum: 10/99532e3d05835ee7abe5729735ca6f113dcb642a9ed5995af2d15eaaabce3d1a91ee3501d268af6b49a22914bfdfe40cb74a61692bc6677539826d4bd3b7201f
languageName: node
linkType: hard

"@chakra-ui/accordion@npm:2.1.3":
version: 2.1.3
resolution: "@chakra-ui/accordion@npm:2.1.3"
Expand Down Expand Up @@ -3714,6 +3699,17 @@ __metadata:
languageName: node
linkType: hard

"@electron/notarize@npm:^2.3.0":
version: 2.3.0
resolution: "@electron/notarize@npm:2.3.0"
dependencies:
debug: "npm:^4.1.1"
fs-extra: "npm:^9.0.1"
promise-retry: "npm:^2.0.1"
checksum: 10/7725617389d78b65fb9b2a616330af2abaa0aa496e2ebc5cf8f6df40a4e746e78c6ed7d2373fa1efcdceca1ff28670d304af1f9be1d905516da642546378f88f
languageName: node
linkType: hard

"@electron/osx-sign@npm:1.0.5":
version: 1.0.5
resolution: "@electron/osx-sign@npm:1.0.5"
Expand Down Expand Up @@ -14257,16 +14253,6 @@ __metadata:
languageName: node
linkType: hard

"electron-notarize@npm:^1.2.2":
version: 1.2.2
resolution: "electron-notarize@npm:1.2.2"
dependencies:
debug: "npm:^4.1.1"
fs-extra: "npm:^9.0.1"
checksum: 10/c66b175b6f584d7bfc67a83eb56c2f4ec0264aab0f693d0a0b4cc2d825b05ada8d119bec4a2ac0fcc1add93dca3282a57bc3dbeb805b0c546e013149905efc40
languageName: node
linkType: hard

"electron-osx-sign@npm:^0.6.0":
version: 0.6.0
resolution: "electron-osx-sign@npm:0.6.0"
Expand Down Expand Up @@ -18833,7 +18819,7 @@ __metadata:
languageName: node
linkType: hard

"js-yaml@npm:^3.10.0, js-yaml@npm:^3.13.1, js-yaml@npm:^3.14.0":
"js-yaml@npm:^3.10.0, js-yaml@npm:^3.13.1":
version: 3.14.1
resolution: "js-yaml@npm:3.14.1"
dependencies:
Expand Down Expand Up @@ -19419,7 +19405,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "keepkey-desktop@workspace:packages/keepkey-desktop"
dependencies:
"@bithighlander/electron-builder-notarize": "npm:0.0.11"
"@electron/notarize": "npm:^2.3.0"
"@ethersproject/contracts": "npm:^5.7.0"
"@keepkey/common-esbuild-bits": "workspace:*"
"@keepkey/device-protocol": "npm:^7.10.2"
Expand Down Expand Up @@ -23839,7 +23825,7 @@ __metadata:
languageName: node
linkType: hard

"read-pkg-up@npm:^7.0.0, read-pkg-up@npm:^7.0.1":
"read-pkg-up@npm:^7.0.1":
version: 7.0.1
resolution: "read-pkg-up@npm:7.0.1"
dependencies:
Expand Down

0 comments on commit f5c8b65

Please sign in to comment.