Skip to content

Commit

Permalink
Electron release v0.10.24
Browse files Browse the repository at this point in the history
  • Loading branch information
laurent22 committed Nov 23, 2017
1 parent fbf7b2c commit 2a93dea
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 6 deletions.
2 changes: 1 addition & 1 deletion ElectronClient/app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ElectronClient/app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Joplin",
"version": "0.10.23",
"version": "0.10.24",
"description": "Joplin for Desktop",
"main": "main.js",
"scripts": {
Expand Down
29 changes: 26 additions & 3 deletions ElectronClient/app/update-readme-download.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ const request = require('request');
const url = 'https://api.github.com/repos/laurent22/joplin/releases/latest';
const readmePath = __dirname + '/../../README.md';

async function msleep(ms) {
return new Promise((resolve, reject) => {
setTimeout(() => {
resolve();
}, ms);
});
}

async function gitHubLatestRelease() {
return new Promise((resolve, reject) => {
request.get({
Expand Down Expand Up @@ -48,8 +56,23 @@ function setReadmeContent(content) {
return fs.writeFileSync(readmePath, content);
}

async function main() {
const release = await gitHubLatestRelease();
async function main(argv) {
const waitForVersion = argv.length === 3 ? argv[2] : null;

if (waitForVersion) console.info('Waiting for version ' + waitForVersion + ' to be released before updating readme...');

let release = null;
while (true) {
release = await gitHubLatestRelease();
if (!waitForVersion) break;

if (release.tag_name !== waitForVersion) {
await msleep(15000);
} else {
console.info('Got version ' + waitForVersion);
break;
}
}

const winUrl = downloadUrl(release, 'windows');
const macOsUrl = downloadUrl(release, 'macos');
Expand All @@ -64,6 +87,6 @@ async function main() {
setReadmeContent(content);
}

main().catch((error) => {
main(process.argv).catch((error) => {
console.error('Fatal error', error);
});
4 changes: 3 additions & 1 deletion ElectronClient/release_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@ git commit -m "Electron release $VERSION"
git tag $VERSION
git push && git push --tags

echo "Create a draft release at: https://github.com/laurent22/joplin/releases/tag/$VERSION"
echo "Create a draft release at: https://github.com/laurent22/joplin/releases/tag/$VERSION"

node "$APP_DIR/update-readme-download.js v$VERSION"

0 comments on commit 2a93dea

Please sign in to comment.