mirror of
https://github.com/laurent22/joplin.git
synced 2024-12-24 10:27:10 +02:00
Desktop: Fixes #8149: Application cannot be installed on Windows 10 in some cases
This commit is contained in:
Laurent Cozic
parent
83db6f6596
commit
21648b1b1b
7
.github/scripts/run_ci.sh
vendored
7
.github/scripts/run_ci.sh
vendored
@ -183,7 +183,12 @@ if [[ $GIT_TAG_NAME = v* ]]; then
|
||||
# cd "$ROOT_DIR/packages/tools"
|
||||
# node bundleDefaultPlugins.js
|
||||
cd "$ROOT_DIR/packages/app-desktop"
|
||||
USE_HARD_LINKS=false yarn run dist
|
||||
|
||||
if [ "$IS_MACOS" == "1" ]; then
|
||||
PYTHON_PATH=$(which python) USE_HARD_LINKS=false yarn run dist
|
||||
else
|
||||
USE_HARD_LINKS=false yarn run dist
|
||||
fi
|
||||
elif [[ $IS_LINUX = 1 ]] && [[ $GIT_TAG_NAME = $SERVER_TAG_PREFIX-* ]]; then
|
||||
echo "Step: Building Docker Image..."
|
||||
cd "$ROOT_DIR"
|
||||
|
||||
@ -116,7 +116,7 @@
|
||||
"@types/react-redux": "7.1.25",
|
||||
"@types/styled-components": "5.1.26",
|
||||
"electron": "19.1.4",
|
||||
"electron-builder": "22.14.13",
|
||||
"electron-builder": "22.11.7",
|
||||
"electron-notarize": "1.2.2",
|
||||
"electron-rebuild": "3.2.9",
|
||||
"glob": "8.1.0",
|
||||
|
||||
173
yarn.lock
173
yarn.lock
@ -4846,7 +4846,7 @@ __metadata:
|
||||
countable: 3.0.1
|
||||
debounce: 1.2.1
|
||||
electron: 19.1.4
|
||||
electron-builder: 22.14.13
|
||||
electron-builder: 22.11.7
|
||||
electron-notarize: 1.2.2
|
||||
electron-rebuild: 3.2.9
|
||||
electron-window-state: 5.0.3
|
||||
@ -7448,7 +7448,7 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@types/debug@npm:^4.1.6":
|
||||
"@types/debug@npm:^4.1.5":
|
||||
version: 4.1.7
|
||||
resolution: "@types/debug@npm:4.1.7"
|
||||
dependencies:
|
||||
@ -8199,12 +8199,12 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@types/yargs@npm:^17.0.1":
|
||||
version: 17.0.7
|
||||
resolution: "@types/yargs@npm:17.0.7"
|
||||
"@types/yargs@npm:^16.0.2":
|
||||
version: 16.0.5
|
||||
resolution: "@types/yargs@npm:16.0.5"
|
||||
dependencies:
|
||||
"@types/yargs-parser": "*"
|
||||
checksum: 520e803720b2a626338c0e2b61825dd1b956910fec4d855018c17e62cf9fb41eb67bcf122ba5c6fb569b1bfac73520d5d73e8be502b87f9a551619df441b1875
|
||||
checksum: 22697f7cc8aa32dcc10981a87f035e183303a58351c537c81fb450270d5c494b1d918186210e445b0eb2e4a8b34a8bda2a595f346bdb1c9ed2b63d193cb00430
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@ -9187,16 +9187,16 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"app-builder-bin@npm:3.7.1":
|
||||
version: 3.7.1
|
||||
resolution: "app-builder-bin@npm:3.7.1"
|
||||
checksum: aae6152d7e7e6eabe35e5430f8b4733cc713bd3f80fdb861c5b675ebc8951aa26b520821d27c5ee31f05e850cdfd9b923b58064307f1ae583fb4e7434d380209
|
||||
"app-builder-bin@npm:3.5.13":
|
||||
version: 3.5.13
|
||||
resolution: "app-builder-bin@npm:3.5.13"
|
||||
checksum: 2947c693642c877e518ced1b13d975e23184dbd6ea8e258d9406034de0416f820b65bc465c47d9367063382e154a298ee614b19189eac46e27bbfe8c3064e9f4
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"app-builder-lib@npm:22.14.13":
|
||||
version: 22.14.13
|
||||
resolution: "app-builder-lib@npm:22.14.13"
|
||||
"app-builder-lib@npm:22.11.7":
|
||||
version: 22.11.7
|
||||
resolution: "app-builder-lib@npm:22.11.7"
|
||||
dependencies:
|
||||
7zip-bin: ~5.1.1
|
||||
"@develar/schema-utils": ~2.6.5
|
||||
@ -9204,14 +9204,12 @@ __metadata:
|
||||
"@malept/flatpak-bundler": ^0.4.0
|
||||
async-exit-hook: ^2.0.1
|
||||
bluebird-lst: ^1.0.9
|
||||
builder-util: 22.14.13
|
||||
builder-util-runtime: 8.9.2
|
||||
builder-util: 22.11.7
|
||||
builder-util-runtime: 8.7.7
|
||||
chromium-pickle-js: ^0.2.0
|
||||
debug: ^4.3.2
|
||||
ejs: ^3.1.6
|
||||
electron-osx-sign: ^0.5.0
|
||||
electron-publish: 22.14.13
|
||||
form-data: ^4.0.0
|
||||
electron-publish: 22.11.7
|
||||
fs-extra: ^10.0.0
|
||||
hosted-git-info: ^4.0.2
|
||||
is-ci: ^3.0.0
|
||||
@ -9223,7 +9221,7 @@ __metadata:
|
||||
sanitize-filename: ^1.6.3
|
||||
semver: ^7.3.5
|
||||
temp-file: ^3.4.0
|
||||
checksum: a32a5ef25b3f70ddcd9b6ba0691221b9e66b0b0a4e1c28e9dc90854d7dcd0183445af55132587458963202afe40b1860b705558b990622d9e5953931b0de2572
|
||||
checksum: e7691fd09d0663693fa650b53c0b92c8027202d07da85b65dcb24a9cbe85fbeb6c8f6b5a4b93282638675a64e1a650bec0962ef945561788937ccad8723b1607
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@ -10318,7 +10316,7 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"bluebird@npm:^3.5.0, bluebird@npm:^3.5.1, bluebird@npm:^3.5.3, bluebird@npm:^3.5.5":
|
||||
"bluebird@npm:^3.5.1, bluebird@npm:^3.5.3, bluebird@npm:^3.5.5":
|
||||
version: 3.7.2
|
||||
resolution: "bluebird@npm:3.7.2"
|
||||
checksum: 869417503c722e7dc54ca46715f70e15f4d9c602a423a02c825570862d12935be59ed9c7ba34a9b31f186c017c23cac6b54e35446f8353059c101da73eac22ef
|
||||
@ -10683,23 +10681,6 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"buffer-alloc-unsafe@npm:^1.1.0":
|
||||
version: 1.1.0
|
||||
resolution: "buffer-alloc-unsafe@npm:1.1.0"
|
||||
checksum: c5e18bf51f67754ec843c9af3d4c005051aac5008a3992938dda1344e5cfec77c4b02b4ca303644d1e9a6e281765155ce6356d85c6f5ccc5cd21afc868def396
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"buffer-alloc@npm:^1.2.0":
|
||||
version: 1.2.0
|
||||
resolution: "buffer-alloc@npm:1.2.0"
|
||||
dependencies:
|
||||
buffer-alloc-unsafe: ^1.1.0
|
||||
buffer-fill: ^1.0.0
|
||||
checksum: 560cd27f3cbe73c614867da373407d4506309c62fe18de45a1ce191f3785ec6ca2488d802ff82065798542422980ca25f903db078c57822218182c37c3576df5
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"buffer-crc32@npm:~0.2.3":
|
||||
version: 0.2.13
|
||||
resolution: "buffer-crc32@npm:0.2.13"
|
||||
@ -10714,13 +10695,6 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"buffer-fill@npm:^1.0.0":
|
||||
version: 1.0.0
|
||||
resolution: "buffer-fill@npm:1.0.0"
|
||||
checksum: c29b4723ddeab01e74b5d3b982a0c6828f2ded49cef049ddca3dac661c874ecdbcecb5dd8380cf0f4adbeb8cff90a7de724126750a1f1e5ebd4eb6c59a1315b1
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"buffer-from@npm:^1.0.0":
|
||||
version: 1.1.2
|
||||
resolution: "buffer-from@npm:1.1.2"
|
||||
@ -10773,38 +10747,45 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"builder-util-runtime@npm:8.9.2":
|
||||
version: 8.9.2
|
||||
resolution: "builder-util-runtime@npm:8.9.2"
|
||||
"builder-util-runtime@npm:8.7.6":
|
||||
version: 8.7.6
|
||||
resolution: "builder-util-runtime@npm:8.7.6"
|
||||
dependencies:
|
||||
debug: ^4.3.2
|
||||
sax: ^1.2.4
|
||||
checksum: 35adcd6162e2ed16635ff7b7ecc353e400dcbbb3e7cd01823bfefc7256cefca8c820f62d15a0f7dbee1c7495a5f1fba4e0e238857a79b48d5f6bd35064f27208
|
||||
checksum: 0d02e6a5069f3d1b105d34bab6ca4aaafd70fbc182986ccf6803afa1705b6139aa99666c08087def21a722b209a81fda9d7ce19671ba041a0953bfb56fe7f4a9
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"builder-util@npm:22.14.13":
|
||||
version: 22.14.13
|
||||
resolution: "builder-util@npm:22.14.13"
|
||||
"builder-util-runtime@npm:8.7.7":
|
||||
version: 8.7.7
|
||||
resolution: "builder-util-runtime@npm:8.7.7"
|
||||
dependencies:
|
||||
debug: ^4.3.2
|
||||
sax: ^1.2.4
|
||||
checksum: cf09c5538d4758a5408a5989ca4c0441fea6416b98f9047508dbe2e8fdfe0fa4b11c7a9952c5bacda0f6711573b05c12ee29bfe93fc456cc3e41b7b2996b54aa
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"builder-util@npm:22.11.7":
|
||||
version: 22.11.7
|
||||
resolution: "builder-util@npm:22.11.7"
|
||||
dependencies:
|
||||
7zip-bin: ~5.1.1
|
||||
"@types/debug": ^4.1.6
|
||||
"@types/debug": ^4.1.5
|
||||
"@types/fs-extra": ^9.0.11
|
||||
app-builder-bin: 3.7.1
|
||||
app-builder-bin: 3.5.13
|
||||
bluebird-lst: ^1.0.9
|
||||
builder-util-runtime: 8.9.2
|
||||
builder-util-runtime: 8.7.7
|
||||
chalk: ^4.1.1
|
||||
cross-spawn: ^7.0.3
|
||||
debug: ^4.3.2
|
||||
fs-extra: ^10.0.0
|
||||
http-proxy-agent: ^5.0.0
|
||||
https-proxy-agent: ^5.0.0
|
||||
is-ci: ^3.0.0
|
||||
js-yaml: ^4.1.0
|
||||
source-map-support: ^0.5.19
|
||||
stat-mode: ^1.0.0
|
||||
temp-file: ^3.4.0
|
||||
checksum: 6d72cc1f0bf7e72debe70049dede2a5eac302fb98b87eb7e60b7feed8631dc66877821367d5e7a87aea881f937a565c25e4e24042b421ef12c1d2afa8b7cc02d
|
||||
checksum: 53791d1feefc1c839ddb711ef84f74c3efdb37b0fc523c9c3ea7261bd755a4126c2f15d826ca8486aed9a3a0a5a942208b86c4ec15be94ee7552e1459ec9e588
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@ -12101,7 +12082,7 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"compare-version@npm:0.1.2, compare-version@npm:^0.1.2":
|
||||
"compare-version@npm:0.1.2":
|
||||
version: 0.1.2
|
||||
resolution: "compare-version@npm:0.1.2"
|
||||
checksum: 0ceaf50b5f912c8eb8eeca19375e617209d200abebd771e9306510166462e6f91ad764f33f210a3058ee27c83f2f001a7a4ca32f509da2d207d0143a3438a020
|
||||
@ -13691,7 +13672,7 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"debug@npm:2.6.9, debug@npm:^2.2.0, debug@npm:^2.3.3, debug@npm:^2.6.8, debug@npm:^2.6.9":
|
||||
"debug@npm:2.6.9, debug@npm:^2.2.0, debug@npm:^2.3.3, debug@npm:^2.6.9":
|
||||
version: 2.6.9
|
||||
resolution: "debug@npm:2.6.9"
|
||||
dependencies:
|
||||
@ -14443,13 +14424,13 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"dmg-builder@npm:22.14.13":
|
||||
version: 22.14.13
|
||||
resolution: "dmg-builder@npm:22.14.13"
|
||||
"dmg-builder@npm:22.11.7":
|
||||
version: 22.11.7
|
||||
resolution: "dmg-builder@npm:22.11.7"
|
||||
dependencies:
|
||||
app-builder-lib: 22.14.13
|
||||
builder-util: 22.14.13
|
||||
builder-util-runtime: 8.9.2
|
||||
app-builder-lib: 22.11.7
|
||||
builder-util: 22.11.7
|
||||
builder-util-runtime: 8.7.6
|
||||
dmg-license: ^1.0.9
|
||||
fs-extra: ^10.0.0
|
||||
iconv-lite: ^0.6.2
|
||||
@ -14457,7 +14438,7 @@ __metadata:
|
||||
dependenciesMeta:
|
||||
dmg-license:
|
||||
optional: true
|
||||
checksum: 01be77f99b9309e356e3ae4fbccc294c4f1dcb65b9b21c434807cbaa9d0c22b2338a5b688bba1b277e0110ac33dd1eb126f4267d09382b1fa12d0878162ac648
|
||||
checksum: a46b7a0eaf304eef8ed1ebe859743d8415a1206c29ffadbf2781e67c849bfbec22c641985f08eb421ccbe47bc629ea954f4818ff22f55c6023542d50639f5852
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@ -14799,16 +14780,16 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"electron-builder@npm:22.14.13":
|
||||
version: 22.14.13
|
||||
resolution: "electron-builder@npm:22.14.13"
|
||||
"electron-builder@npm:22.11.7":
|
||||
version: 22.11.7
|
||||
resolution: "electron-builder@npm:22.11.7"
|
||||
dependencies:
|
||||
"@types/yargs": ^17.0.1
|
||||
app-builder-lib: 22.14.13
|
||||
builder-util: 22.14.13
|
||||
builder-util-runtime: 8.9.2
|
||||
"@types/yargs": ^16.0.2
|
||||
app-builder-lib: 22.11.7
|
||||
builder-util: 22.11.7
|
||||
builder-util-runtime: 8.7.7
|
||||
chalk: ^4.1.1
|
||||
dmg-builder: 22.14.13
|
||||
dmg-builder: 22.11.7
|
||||
fs-extra: ^10.0.0
|
||||
is-ci: ^3.0.0
|
||||
lazy-val: ^1.0.5
|
||||
@ -14818,7 +14799,7 @@ __metadata:
|
||||
bin:
|
||||
electron-builder: cli.js
|
||||
install-app-deps: install-app-deps.js
|
||||
checksum: 1c5179ca9c4db3886377f86b6aa00db703180358134fefbf4c32daa54ed2620c47bf5495d0e4ee12bd3694dd7d3553a6561f088d2e5ab571b9e9b2f07ff594f2
|
||||
checksum: 8f21d2d1d4acb88c51b077d8d7da851d6ac4d32577296c586640618c9569be33826ce55e255d5a849060748fae1c218f38baef4792da247163962065e543a103
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@ -14832,35 +14813,18 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"electron-osx-sign@npm:^0.5.0":
|
||||
version: 0.5.0
|
||||
resolution: "electron-osx-sign@npm:0.5.0"
|
||||
dependencies:
|
||||
bluebird: ^3.5.0
|
||||
compare-version: ^0.1.2
|
||||
debug: ^2.6.8
|
||||
isbinaryfile: ^3.0.2
|
||||
minimist: ^1.2.0
|
||||
plist: ^3.0.1
|
||||
bin:
|
||||
electron-osx-flat: bin/electron-osx-flat.js
|
||||
electron-osx-sign: bin/electron-osx-sign.js
|
||||
checksum: ca1e55d8cb0987b78bfaf197860e73f7e6266cb219f3d6fd32f25665a8393efb284115db9e2246b42f75cdf6163c148060aff8a02960f4f810c6502d6f7d447c
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"electron-publish@npm:22.14.13":
|
||||
version: 22.14.13
|
||||
resolution: "electron-publish@npm:22.14.13"
|
||||
"electron-publish@npm:22.11.7":
|
||||
version: 22.11.7
|
||||
resolution: "electron-publish@npm:22.11.7"
|
||||
dependencies:
|
||||
"@types/fs-extra": ^9.0.11
|
||||
builder-util: 22.14.13
|
||||
builder-util-runtime: 8.9.2
|
||||
builder-util: 22.11.7
|
||||
builder-util-runtime: 8.7.7
|
||||
chalk: ^4.1.1
|
||||
fs-extra: ^10.0.0
|
||||
lazy-val: ^1.0.5
|
||||
mime: ^2.5.2
|
||||
checksum: 66cf15ad52c9dea67d744eb9080c20d43792a734f4e524b8ffc676e8ce9541a2fe4b11a25e4bd3f48e670160e72edfc7eeb77767e843232f4454075ee91d2475
|
||||
checksum: 99eb8f50d92210904212125e59936e45bae1cd3f2b363f728846d6ff23fa1358395945c19f582b977dcc8e3f45c1bbcfb8100e0cf5718429be2c135a8359e6e4
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@ -19923,15 +19887,6 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"isbinaryfile@npm:^3.0.2":
|
||||
version: 3.0.3
|
||||
resolution: "isbinaryfile@npm:3.0.3"
|
||||
dependencies:
|
||||
buffer-alloc: ^1.2.0
|
||||
checksum: 9a555786857c66fe36024d15a54e0ca371c02275622b007356d6afca2b3bca179cb0bd97e1adf5d3922b3325c0fe22813645c7f7eafb4c4bdab1da9d635133c2
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"isbinaryfile@npm:^4.0.8":
|
||||
version: 4.0.10
|
||||
resolution: "isbinaryfile@npm:4.0.10"
|
||||
@ -26350,7 +26305,7 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"plist@npm:^3.0.1, plist@npm:^3.0.4":
|
||||
"plist@npm:^3.0.4":
|
||||
version: 3.0.4
|
||||
resolution: "plist@npm:3.0.4"
|
||||
dependencies:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user