diff --git a/.github/workflows/build-macos-m1.yml b/.github/workflows/build-macos-m1.yml index 0fae72b01a..0608c2e23a 100644 --- a/.github/workflows/build-macos-m1.yml +++ b/.github/workflows/build-macos-m1.yml @@ -62,8 +62,10 @@ jobs: yarn install cd packages/app-desktop npm pkg set 'build.mac.artifactName'='${productName}-${version}-${arch}.${ext}' - npm pkg set 'build.mac.target.target'='dmg' - npm pkg set 'build.mac.target.arch[0]'='arm64' + npm pkg set 'build.mac.target[0].target'='dmg' + npm pkg set 'build.mac.target[0].arch[0]'='arm64' + npm pkg set 'build.mac.target[1].target'='zip' + npm pkg set 'build.mac.target[1].arch[0]'='arm64' if [[ $GIT_TAG_NAME = v* ]]; then echo "Building and publishing desktop application..." diff --git a/packages/app-desktop/package.json b/packages/app-desktop/package.json index 5e35ac517e..11d7e8a512 100644 --- a/packages/app-desktop/package.json +++ b/packages/app-desktop/package.json @@ -75,20 +75,27 @@ }, "nsis": { "oneClick": false, - "allowToChangeInstallationDirectory": false, - "differentialPackage": false + "allowToChangeInstallationDirectory": false }, "portable": { "artifactName": "${productName}Portable.${ext}" }, "mac": { "icon": "../../Assets/macOs.icns", - "target": { - "target": "dmg", - "arch": [ - "x64" - ] - }, + "target": [ + { + "target": "dmg", + "arch": [ + "x64" + ] + }, + { + "target": "zip", + "arch": [ + "x64" + ] + } + ], "hardenedRuntime": true, "notarize": false, "entitlements": "./build-mac/entitlements.mac.inherit.plist", @@ -112,14 +119,10 @@ "MimeType": "x-scheme-handler/joplin;" }, "target": "AppImage" - }, - "dmg": { - "writeUpdateInfo": false } }, "homepage": "https://github.com/laurent22/joplin#readme", "devDependencies": { - "7zip-bin": "5.2.0", "@electron/rebuild": "3.3.0", "@joplin/default-plugins": "~3.1", "@joplin/tools": "~3.1", @@ -132,6 +135,7 @@ "@types/react-redux": "7.1.33", "@types/styled-components": "5.1.32", "@types/tesseract.js": "2.0.0", + "7zip-bin": "5.2.0", "electron": "29.1.0", "electron-builder": "24.13.3", "glob": "10.3.12",