From 8e68aef7f991a7c7e1c1910198907bd1b782c1dd Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Sat, 21 Jan 2023 15:39:15 +0100 Subject: [PATCH 1/6] improvements to package json --- gui/package.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gui/package.json b/gui/package.json index 528713de..d7a94ff7 100644 --- a/gui/package.json +++ b/gui/package.json @@ -77,7 +77,11 @@ "type": "link", "path": "/Applications" } - ] + ], + "hardenedRuntime": true, + "entitlements": "build/entitlements.plist", + "entitlementsInherit": "build/entitlements.plist", + "gatekeeperAssess": false }, "win": { "icon": "build/icon.png", From 432d091c97b41ecebfdd845066d0862ce2dd7aa9 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Sat, 21 Jan 2023 15:48:54 +0100 Subject: [PATCH 2/6] set fail-fast: false --- .github/workflows/build_multiplatform.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index f5c2ad3e..b76f8dd9 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -196,6 +196,7 @@ jobs: name: Build FreeDATA packages runs-on: ${{ matrix.os }} strategy: + fail-fast: false matrix: os: [ubuntu-20.04, macos-11, windows-latest] include: From 7f7061dae3a795f15557f25b914e06c12fec259c Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Sat, 21 Jan 2023 15:54:16 +0100 Subject: [PATCH 3/6] removed dmg build step --- gui/package.json | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/gui/package.json b/gui/package.json index d7a94ff7..adc0b347 100644 --- a/gui/package.json +++ b/gui/package.json @@ -64,25 +64,17 @@ "buildResources": "build", "output": "dist" }, - "dmg": { - "icon": "build/icon.png", - "contents": [ - { - "x": 130, - "y": 220 - }, - { - "x": 410, - "y": 220, - "type": "link", - "path": "/Applications" - } + "mac": { + "target": [ + "default" ], + "icon": "build/icon.png", "hardenedRuntime": true, "entitlements": "build/entitlements.plist", "entitlementsInherit": "build/entitlements.plist", "gatekeeperAssess": false }, + "win": { "icon": "build/icon.png", "target": [ From 19a473c577d9fecc0b3cf9d50a589ff453f52bbc Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Sat, 21 Jan 2023 16:03:12 +0100 Subject: [PATCH 4/6] moved entitlements to different folder --- gui/entitlements.plist | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 gui/entitlements.plist diff --git a/gui/entitlements.plist b/gui/entitlements.plist deleted file mode 100644 index 983f1099..00000000 --- a/gui/entitlements.plist +++ /dev/null @@ -1,16 +0,0 @@ - - - - - com.apple.security.cs.allow-jit - - com.apple.security.cs.allow-unsigned-executable-memory - - com.apple.security.cs.disable-library-validation - - com.apple.security.cs.disable-executable-page-protection - - com.apple.security.automation.apple-events - - - \ No newline at end of file From 6e863ddd2268d83efd08cd5b3fe08c0ff2527f79 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Sat, 21 Jan 2023 16:03:52 +0100 Subject: [PATCH 5/6] moved entitlements to different folder --- gui/build/entitlements.plist | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 gui/build/entitlements.plist diff --git a/gui/build/entitlements.plist b/gui/build/entitlements.plist new file mode 100644 index 00000000..983f1099 --- /dev/null +++ b/gui/build/entitlements.plist @@ -0,0 +1,16 @@ + + + + + com.apple.security.cs.allow-jit + + com.apple.security.cs.allow-unsigned-executable-memory + + com.apple.security.cs.disable-library-validation + + com.apple.security.cs.disable-executable-page-protection + + com.apple.security.automation.apple-events + + + \ No newline at end of file From 4e83d4914470d9abb810ccb1762010affc1d9de3 Mon Sep 17 00:00:00 2001 From: DJ2LS <75909252+DJ2LS@users.noreply.github.com> Date: Sat, 21 Jan 2023 17:20:12 +0100 Subject: [PATCH 6/6] increased attempts for build app --- .github/workflows/build_multiplatform.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index b76f8dd9..dd6f4e05 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -362,6 +362,7 @@ jobs: # release the app after building release: ${{ startsWith(github.ref, 'refs/tags/v') }} args: ${{ matrix.electron_parameters }} + max_attempts: 3 - name: Compress TNC uses: thedoctor0/zip-release@master