From 23d090eed0f9930a084ad400fb84659c42005e21 Mon Sep 17 00:00:00 2001 From: Zef Hemel Date: Thu, 5 Jan 2023 15:12:43 +0100 Subject: [PATCH] Fixes #283 --- .github/workflows/desktop.yml | 3 --- desktop/entitlements.plist | 15 +++++++++++++++ desktop/forge.config.ts | 11 +++++++++-- desktop/package.json | 2 +- 4 files changed, 25 insertions(+), 6 deletions(-) create mode 100644 desktop/entitlements.plist diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml index d105b0a2..8015cabc 100644 --- a/.github/workflows/desktop.yml +++ b/.github/workflows/desktop.yml @@ -71,9 +71,6 @@ jobs: draft: true files: | desktop/out/**/*.deb - desktop/out/**/*.dmg desktop/out/**/*Setup.exe - desktop/out/**/*.nupkg desktop/out/**/*.rpm desktop/out/**/*.zip - desktop/out/**/RELEASES \ No newline at end of file diff --git a/desktop/entitlements.plist b/desktop/entitlements.plist new file mode 100644 index 00000000..674c3378 --- /dev/null +++ b/desktop/entitlements.plist @@ -0,0 +1,15 @@ + + + + + com.apple.security.cs.allow-jit + + com.apple.security.cs.allow-unsigned-executable-memory + + + + \ No newline at end of file diff --git a/desktop/forge.config.ts b/desktop/forge.config.ts index d43a28c6..2d07afa1 100644 --- a/desktop/forge.config.ts +++ b/desktop/forge.config.ts @@ -10,7 +10,6 @@ import { mainConfig } from "./webpack.main.config"; import { rendererConfig } from "./webpack.renderer.config"; import { platform } from "node:os"; -import axios from "axios"; import fs from "node:fs"; import path from "node:path"; import decompress from "decompress"; @@ -70,7 +69,15 @@ const config: ForgeConfig = { fs.copyFileSync("../dist/silverbullet.js", "resources/silverbullet.js"); }).then((r) => callback()).catch(callback); }], - osxSign: true, + osxSign: { + optionsForFile: (filePath: string) => { + // So these entitlements somehow only seem to be needed for the Intel macOS build + // Why? No idea. But it works. + return { + entitlements: "entitlements.plist", + }; + }, + }, }, rebuildConfig: {}, makers: [ diff --git a/desktop/package.json b/desktop/package.json index 82f46244..1e5b7082 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -1,6 +1,6 @@ { "name": "silverbullet", - "version": "0.0.2", + "version": "0.0.3", "description": "Markdown as a platform", "main": ".webpack/main", "scripts": {