Merge pull request #825 from complexdatacollective/release/6.5.2

jthrilly · web-flow · commit 06fbc91e17a2 · 2024-04-24T03:03:20.000-05:00
Release/6.5.2
diff --git 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:
diff --git 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');
diff --git a/network-canvas b/network-canvas
@@ -1 +1 @@
-Subproject commit 717c15d710a93f38a8409b61d4ccbc5f1f1b1646
+Subproject commit b78c652e9c509126a77a3824499ef1a98bb860b3
diff --git a/package-lock.json b/package-lock.json
diff --git 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 <info@networkcanvas.com>",
@@ -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",
diff --git 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",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "network-canvas-architect",`
`3`		`- "version": "6.5.1",`
	`3`	`+ "version": "6.5.2",`
`4`	`4`	`"productName": "Network Canvas Architect",`
`5`	`5`	`"description": "A tool for building Network Canvas interviews.",`
`6`	`6`	`"author": "Complex Data Collective",`