From 7e6d305193bc1783dec5d13d6d0a58914526330a Mon Sep 17 00:00:00 2001 From: Caden Buckhalt Date: Fri, 19 Apr 2024 08:04:04 -0700 Subject: [PATCH 1/5] update interviewer ref --- network-canvas | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/network-canvas b/network-canvas index 717c15d71..2fbdd34c4 160000 --- a/network-canvas +++ b/network-canvas @@ -1 +1 @@ -Subproject commit 717c15d710a93f38a8409b61d4ccbc5f1f1b1646 +Subproject commit 2fbdd34c4837208a726589da16ac62ade32c779e From 68f52e84c820d03c39d96660538a52e2012fe933 Mon Sep 17 00:00:00 2001 From: Caden Buckhalt Date: Fri, 19 Apr 2024 08:05:08 -0700 Subject: [PATCH 2/5] bump version to 6.5.2 --- package-lock.json | 2 +- package.json | 2 +- public/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6ee652f46..9eaa74261 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "network-canvas-architect", - "version": "6.5.1", + "version": "6.5.2", "lockfileVersion": 3, "requires": true, "packages": { diff --git a/package.json b/package.json index 2baeccddb..14cdd8be9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "network-canvas-architect", - "version": "6.5.1", + "version": "6.5.2", "productName": "Network Canvas Architect", "description": "A tool for building Network Canvas interviews.", "author": "Complex Data Collective ", diff --git a/public/package.json b/public/package.json index c860b2e85..fd1bbdcc6 100644 --- a/public/package.json +++ b/public/package.json @@ -1,6 +1,6 @@ { "name": "network-canvas-architect", - "version": "6.5.1", + "version": "6.5.2", "productName": "Network Canvas Architect", "description": "A tool for building Network Canvas interviews.", "author": "Complex Data Collective", From 1f7e51427c69f79d05cd12f2613c457ec0fbcd24 Mon Sep 17 00:00:00 2001 From: Joshua Melville Date: Tue, 23 Apr 2024 19:29:44 +0200 Subject: [PATCH 3/5] update interviewer reference --- network-canvas | 2 +- package-lock.json | 25 +++++++++++-------------- package.json | 2 +- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/network-canvas b/network-canvas index 2fbdd34c4..b78c652e9 160000 --- a/network-canvas +++ b/network-canvas @@ -1 +1 @@ -Subproject commit 2fbdd34c4837208a726589da16ac62ade32c779e +Subproject commit b78c652e9c509126a77a3824499ef1a98bb860b3 diff --git a/package-lock.json b/package-lock.json index 9eaa74261..1ce0668f3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "packages": { "": { "name": "network-canvas-architect", - "version": "6.5.1", + "version": "6.5.2", "hasInstallScript": true, "devDependencies": { "@babel/cli": "^7.12.1", @@ -16,7 +16,7 @@ "@babel/plugin-proposal-class-properties": "^7.12.1", "@babel/preset-react": "^7.12.1", "@codaco/ui": "^5.8.5", - "@electron/notarize": "^1.2.3", + "@electron/notarize": "^2.3.0", "@material-ui/icons": "^4.11.2", "@tippyjs/react": "^4.2.5", "animejs": "^2.2.0", @@ -2650,13 +2650,14 @@ } }, "node_modules/@electron/notarize": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-1.2.3.tgz", - "integrity": "sha512-9oRzT56rKh5bspk3KpAVF8lPKHYQrBnRwcgiOeR0hdilVEQmszDaAu0IPCPrwwzJN0ugNs0rRboTreHMt/6mBQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.3.0.tgz", + "integrity": "sha512-EiTBU0BwE7HZZjAG1fFWQaiQpCuPrVGn7jPss1kUjD6eTTdXXd29RiZqEqkgN7xqt/Pgn4g3I7Saqovanrfj3w==", "dev": true, "dependencies": { "debug": "^4.1.1", - "fs-extra": "^9.0.1" + "fs-extra": "^9.0.1", + "promise-retry": "^2.0.1" }, "engines": { "node": ">= 10.0.0" @@ -7938,9 +7939,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001524", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001524.tgz", - "integrity": "sha512-Jj917pJtYg9HSJBF95HVX3Cdr89JUyLT4IZ8SvM5aDRni95swKgYi3TgYLH5hnGfPE/U1dg6IfZ50UsIlLkwSA==", + "version": "1.0.30001612", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001612.tgz", + "integrity": "sha512-lFgnZ07UhaCcsSZgWW0K5j4e69dK1u/ltrL9lTUiFOwNHs12S3UMIEYgBV0Z6C6hRDev7iRnMzzYmKabYdXF9g==", "dev": true, "funding": [ { @@ -12050,9 +12051,7 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", - "dev": true, - "optional": true, - "peer": true + "dev": true }, "node_modules/errlop": { "version": "4.1.0", @@ -27912,8 +27911,6 @@ "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", "dev": true, - "optional": true, - "peer": true, "dependencies": { "err-code": "^2.0.2", "retry": "^0.12.0" diff --git a/package.json b/package.json index 14cdd8be9..4c2470a46 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "@babel/plugin-proposal-class-properties": "^7.12.1", "@babel/preset-react": "^7.12.1", "@codaco/ui": "^5.8.5", - "@electron/notarize": "^1.2.3", + "@electron/notarize": "^2.3.0", "@material-ui/icons": "^4.11.2", "@tippyjs/react": "^4.2.5", "animejs": "^2.2.0", From bde5ad31a01b5dcd16d6367ee1d9cb269119f431 Mon Sep 17 00:00:00 2001 From: Joshua Melville Date: Tue, 23 Apr 2024 19:31:13 +0200 Subject: [PATCH 4/5] update aftersign hook --- build-resources/scripts/afterSignHook.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build-resources/scripts/afterSignHook.js b/build-resources/scripts/afterSignHook.js index 38c857e39..2296ad597 100644 --- a/build-resources/scripts/afterSignHook.js +++ b/build-resources/scripts/afterSignHook.js @@ -5,7 +5,7 @@ const path = require('path'); const electronNotarize = require('@electron/notarize'); async function note(params) { - // Only notarize the app on Mac OS only. + // Only notarize the app on macOS. if (process.platform !== 'darwin') { return; } @@ -22,9 +22,9 @@ async function note(params) { tool: 'notarytool', appBundleId: 'NetworkCanvasArchitect', appPath, - appleApiKey: '~/.private_keys/AuthKey_J58L47W6H9.p8', - appleApiKeyId: 'J58L47W6H9', // This is taken from the filename of the .p8 file in your icloud drive - appleApiIssuer: '69a6de92-60bf-47e3-e053-5b8c7c11a4d1', + appleApiKey: '~/.private_keys/AuthKey_A78M67RCH9.p8', + appleApiKeyId: 'A78M67RCH9', // Taken from https://appstoreconnect.apple.com/access/integrations/api + appleApiIssuer: '69a6de92-60bf-47e3-e053-5b8c7c11a4d1',// As above }); console.log('Done notarizing Architect'); From 93e6d9bb35e38f23a496e8fd9b3e39e600f32b8b Mon Sep 17 00:00:00 2001 From: Joshua Melville Date: Tue, 23 Apr 2024 20:09:24 +0200 Subject: [PATCH 5/5] remove asset deletion from workflow --- .github/workflows/dist.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/dist.yml b/.github/workflows/dist.yml index e9cc73721..88d232af5 100644 --- a/.github/workflows/dist.yml +++ b/.github/workflows/dist.yml @@ -40,12 +40,6 @@ jobs: - name: Install node modules run: npm install - - name: Delete current release assets - uses: Kellojo/delete-release-assets-action@v1.9 - with: - delete-only-drafts: true - github-access-token: ${{ secrets.GITHUB_TOKEN }} - - name: Linux build run: npm run dist:linux -- --publish always env: