Merge branch 'develop' into master

This commit is contained in:
Richard Hansen 2020-12-23 17:03:33 -05:00
commit 01a763e15e
2 changed files with 42 additions and 12631 deletions

View file

@ -1,4 +1,5 @@
'use strict';
const fs = require('fs');
const child_process = require('child_process');
const semver = require('../src/node_modules/semver');
@ -58,8 +59,9 @@ child_process.execSync(`git clone git@github.com:ether/ether.github.com.git`);
child_process.execSync(`cp -R out/doc/ ether.github.com/doc/${newVersion}`);
console.log('Once merged into master please run the following commands');
console.log(`git tag -a ${newVersion} && git push origin master`);
console.log(`cd ether.github.com && git add . && git commit -m ${newVersion} docs`);
console.log(`git tag -a ${newVersion} -m ${newVersion} && git push origin master`);
console.log(`cd ether.github.com && git add . && git commit -m '${newVersion} docs'`);
console.log(`Build the windows zip`)
console.log(`Visit https://github.com/ether/etherpad-lite/releases/new and create a new release with 'master' as the target and the version is ${newVersion}. Include the windows zip as an assett`)
console.log('Once the new docs are uploaded then modify the download link on etherpad.org and then pull master onto develop');
console.log('Finally go public with an announcement via our comms channels :)');

12665
src/package-lock.json generated

File diff suppressed because it is too large Load diff