WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 0a87fd0

Browse files
author
Alberto Iannaccone
authored
IDE updater bugfixes (#846)
* IDE updater assorted bugfix - add linux AppImage target - fix hardcoded if condition that causes to always show the update dialog - fix redundant test build version - recalculate sha512 after notarization on macOS * boost notarization speed * recalculate artifacts hash
1 parent 9b1f15d commit 0a87fd0

File tree

9 files changed

+120
-61
lines changed

9 files changed

+120
-61
lines changed

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ jobs:
5050
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5151
AC_USERNAME: ${{ secrets.AC_USERNAME }}
5252
AC_PASSWORD: ${{ secrets.AC_PASSWORD }}
53+
AC_TEAM_ID: ${{ secrets.AC_TEAM_ID }}
5354
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
5455
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
5556
IS_NIGHTLY: ${{ github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main') }}
@@ -96,11 +97,11 @@ jobs:
9697
matrix:
9798
artifact:
9899
- path: '*Linux_64bit.zip'
99-
name: Linux_X86-64
100+
name: Linux_X86-64_zip
101+
- path: '*Linux_64bit.AppImage'
102+
name: Linux_X86-64_app_image
100103
- path: '*macOS_64bit.dmg'
101104
name: macOS_dmg
102-
- path: '*macOS_64bit.zip'
103-
name: macOS_zip
104105
- path: '*Windows_64bit.exe'
105106
name: Windows_X86-64_interactive_installer
106107
- path: '*Windows_64bit.msi'

‎arduino-ide-extension/src/node/ide-updater/ide-updater-impl.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,7 @@ export class IDEUpdaterImpl implements IDEUpdater {
5858
} = await this.updater.checkForUpdates();
5959

6060
this.cancellationToken = cancellationToken;
61-
if (
62-
this.updater.currentVersion.compare(updateInfo.version) === -1 ||
63-
true
64-
) {
61+
if (this.updater.currentVersion.compare(updateInfo.version) === -1) {
6562
/*
6663
'latest.txt' points to the latest changelog that has been generated by the CI,
6764
so we need to make a first GET request to get the filename of the changelog

‎electron/build/scripts/notarize.js‎

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,31 @@ const isCI = require('is-ci');
22
const { notarize } = require('electron-notarize');
33

44
exports.default = async function notarizing(context) {
5-
if (!isCI) {
6-
console.log('Skipping notarization: not on CI.');
7-
return;
8-
}
9-
if (process.env.IS_FORK === 'true') {
10-
console.log('Skipping the app notarization: building from a fork.');
11-
return;
12-
}
13-
const { electronPlatformName, appOutDir } = context;
14-
if (electronPlatformName !== 'darwin') {
15-
return;
16-
}
5+
if (!isCI) {
6+
console.log('Skipping notarization: not on CI.');
7+
return;
8+
}
9+
if (process.env.IS_FORK === 'true') {
10+
console.log('Skipping the app notarization: building from a fork.');
11+
return;
12+
}
13+
const { electronPlatformName, appOutDir } = context;
14+
if (electronPlatformName !== 'darwin') {
15+
return;
16+
}
1717

18-
const appName = context.packager.appInfo.productFilename;
19-
const appBundleId = context.packager.config.appId;
20-
console.log(`>>> Notarizing ${appBundleId} at ${appOutDir}/${appName}.app...`);
18+
const appName = context.packager.appInfo.productFilename;
19+
const appBundleId = context.packager.config.appId;
20+
console.log(
21+
`>>> Notarizing ${appBundleId} at ${appOutDir}/${appName}.app...`
22+
);
2123

22-
return await notarize({
23-
appBundleId,
24-
appPath: `${appOutDir}/${appName}.app`,
25-
appleId: process.env.AC_USERNAME,
26-
appleIdPassword: process.env.AC_PASSWORD,
27-
});
24+
await notarize({
25+
appBundleId,
26+
appPath: `${appOutDir}/${appName}.app`,
27+
appleId: process.env.AC_USERNAME,
28+
appleIdPassword: process.env.AC_PASSWORD,
29+
teamId: process.env.AC_TEAM_ID,
30+
tool: 'notarytool',
31+
});
2832
};

‎electron/build/template-package.json‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@theia/cli": "1.22.1",
1515
"cross-env": "^7.0.2",
1616
"electron-builder": "22.10.5",
17-
"electron-notarize": "^0.3.0",
17+
"electron-notarize": "^1.1.1",
1818
"is-ci": "^2.0.0",
1919
"ncp": "^2.0.0",
2020
"shelljs": "^0.8.3"
@@ -93,18 +93,13 @@
9393
"entitlements": "resources/entitlements.mac.plist",
9494
"entitlementsInherit": "resources/entitlements.mac.plist",
9595
"target": [
96-
"dmg",
97-
"zip"
96+
"dmg"
9897
]
9998
},
10099
"linux": {
101100
"target": [
102-
{
103-
"target": "zip"
104-
},
105-
{
106-
"target": "AppImage"
107-
}
101+
"zip",
102+
"AppImage"
108103
],
109104
"category": "Development",
110105
"icon": "resources/icons"

‎electron/packager/config.js‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -80,19 +80,12 @@ function getVersion() {
8080
}
8181
if (!isRelease) {
8282
if (isNightly) {
83-
version = `${version}-nightly.${timestamp()}`;
83+
version = `${version}-nightly-${timestamp()}`;
8484
} else {
85-
version = `${version}-snapshot.${currentCommitish()}`;
85+
version = `${version}-snapshot-${currentCommitish()}`;
8686
}
87-
if (!isRelease) {
88-
if (isNightly) {
89-
version = `${version}-nightly-${timestamp()}`;
90-
} else {
91-
version = `${version}-snapshot-${currentCommitish()}`;
92-
}
93-
if (!semver.valid(version)) {
94-
throw new Error(`Invalid patched version: '${version}'.`);
95-
}
87+
if (!semver.valid(version)) {
88+
throw new Error(`Invalid patched version: '${version}'.`);
9689
}
9790
}
9891
return version;

‎electron/packager/index.js‎

Lines changed: 64 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,10 +257,12 @@ ${fs.readFileSync(path('..', 'build', 'package.json')).toString()}
257257
);
258258

259259
//-----------------------------------------------------------------------------------------------------+
260-
// Copy to another folder. Azure does not support wildcard for `[email protected]` |
260+
// Recalculate artifacts hash and copy to another folder (because they can change after signing them).
261+
// Azure does not support wildcard for `[email protected]` |
261262
//-----------------------------------------------------------------------------------------------------+
262263
if (isCI) {
263264
try {
265+
await recalculateArtifactsHash();
264266
await copyFilesToBuildArtifacts();
265267
} catch (e) {
266268
echo(JSON.stringify(e));
@@ -400,6 +402,67 @@ ${fs.readFileSync(path('..', 'build', 'package.json')).toString()}
400402
}
401403
}
402404

405+
async function recalculateArtifactsHash() {
406+
echo(`🚢 Detected CI, recalculating artifacts hash...`);
407+
const { platform } = process;
408+
const cwd = path('..', 'build', 'dist');
409+
const channelFilePath = join(cwd, getChannelFile(platform));
410+
const yaml = require('yaml');
411+
412+
try {
413+
let fileContents = fs.readFileSync(channelFilePath, 'utf8');
414+
const newChannelFile = yaml.parse(fileContents);
415+
const { files, path } = newChannelFile;
416+
const newSha512 = await hashFile(join(cwd, path));
417+
newChannelFile.sha512 = newSha512;
418+
if (!!files) {
419+
const newFiles = [];
420+
for (let file of files) {
421+
const { url } = file;
422+
const { size } = fs.statSync(join(cwd, url));
423+
const newSha512 = await hashFile(join(cwd, url));
424+
newFiles.push({ ...file, sha512: newSha512, size });
425+
}
426+
newChannelFile.files = newFiles;
427+
}
428+
429+
const newChannelFileRaw = yaml.stringify(newChannelFile);
430+
fs.writeFileSync(channelFilePath, newChannelFileRaw);
431+
echo(`👌 >>> Channel file updated successfully. New channel file:`);
432+
echo(newChannelFileRaw);
433+
} catch (e) {
434+
console.log(e);
435+
}
436+
}
437+
438+
async function hashFile(
439+
file,
440+
algorithm = 'sha512',
441+
encoding = 'base64',
442+
options
443+
) {
444+
const crypto = require('crypto');
445+
return await new Promise((resolve, reject) => {
446+
const hash = crypto.createHash(algorithm);
447+
hash.on('error', reject).setEncoding(encoding);
448+
fs.createReadStream(
449+
file,
450+
Object.assign({}, options, {
451+
highWaterMark: 1024 * 1024,
452+
/* better to use more memory but hash faster */
453+
})
454+
)
455+
.on('error', reject)
456+
.on('end', () => {
457+
hash.end();
458+
resolve(hash.read());
459+
})
460+
.pipe(hash, {
461+
end: false,
462+
});
463+
});
464+
}
465+
403466
/**
404467
* Joins tha path from `__dirname`.
405468
*/

‎electron/packager/package.json‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,11 @@
1313
"author": "Arduino SA",
1414
"license": "AGPL-3.0-or-later",
1515
"dependencies": {
16+
"7zip-min": "^1.1.1",
1617
"@types/file-type": "^10.9.1",
1718
"@types/temp": "^0.8.32",
18-
"7zip-min": "^1.1.1",
1919
"chai": "^4.2.0",
20+
"crypto": "^1.0.1",
2021
"dateformat": "^3.0.3",
2122
"deepmerge": "2.01",
2223
"depcheck": "^0.9.2",
@@ -25,9 +26,10 @@
2526
"is-ci": "^2.0.0",
2627
"mocha": "^7.1.1",
2728
"semver": "^7.3.2",
28-
"sinon": "^9.0.1",
2929
"shelljs": "^0.8.3",
30+
"sinon": "^9.0.1",
3031
"temp": "^0.9.1",
32+
"yaml": "^1.10.2",
3133
"yargs": "^12.0.5"
3234
},
3335
"engines": {
@@ -39,4 +41,4 @@
3941
"watch-extensions": "js",
4042
"timeout": 10000
4143
}
42-
}
44+
}

‎electron/packager/utils.js‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -197,15 +197,9 @@ function git(command) {
197197
// to work correctly.
198198
// For more information: https://www.electron.build/auto-update
199199
function getChannelFile(platform) {
200-
let currentChannel = '';
201-
if (isNightly) {
202-
currentChannel = 'beta';
203-
} else if (isRelease) {
200+
let currentChannel = 'beta';
201+
if (isRelease) {
204202
currentChannel = 'latest';
205-
} else {
206-
// We're not creating a nightly build nor releasing
207-
// a new version, no need for a channel file.
208-
return '';
209203
}
210204
return (
211205
currentChannel +

‎electron/packager/yarn.lock‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,11 @@ cross-spawn@^6.0.0:
437437
shebang-command "^1.2.0"
438438
which "^1.2.9"
439439

440+
crypto@^1.0.1:
441+
version "1.0.1"
442+
resolved "https://registry.yarnpkg.com/crypto/-/crypto-1.0.1.tgz#2af1b7cad8175d24c8a1b0778255794a21803037"
443+
integrity sha512-VxBKmeNcqQdiUQUW2Tzq0t377b54N2bMtXO/qiLa+6eRRmmC4qT3D4OnTGoT/U6O9aklQ/jTwbOtRMTTY8G0Ig==
444+
440445
dateformat@^3.0.3:
441446
version "3.0.3"
442447
resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
@@ -1597,6 +1602,11 @@ wrappy@1:
15971602
resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
15981603
integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
15991604

1605+
yaml@^1.10.2:
1606+
version "1.10.2"
1607+
resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
1608+
integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
1609+
16001610
[email protected], yargs-parser@^13.1.2:
16011611
version "13.1.2"
16021612
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
@@ -1679,4 +1689,4 @@ yargs@^15.0.2:
16791689
string-width "^4.2.0"
16801690
which-module "^2.0.0"
16811691
y18n "^4.0.0"
1682-
yargs-parser "^18.1.1"
1692+
yargs-parser "^18.1.1"

0 commit comments

Comments
 (0)