self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00
Code Issues Releases Activity

Tools: Command to merge release version update

Browse Source
This commit is contained in:
Laurent Cozic 2022-04-12 16:44:45 +01:00
parent cfd5416b73
commit f24750f7b4
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/tools/release-electron.ts
View File

@ -1,4 +1,4 @@
import { execCommand2, githubRelease, gitPullTry, rootDir } from './tool-utils';
import { execCommand2, gitCurrentBranch, githubRelease, gitPullTry, rootDir } from './tool-utils';
const appDir = `${rootDir}/packages/app-desktop`;
@ -27,10 +27,12 @@ async function main() {
console.info('Release options: ', releaseOptions);
const release = await githubRelease('joplin', tagName, releaseOptions);
const currentBranch = await gitCurrentBranch();
console.info(`Created GitHub release: ${release.html_url}`);
console.info('GitHub release page: https://github.com/laurent22/joplin/releases');
console.info(`To create changelog: node packages/tools/git-changelog.js ${version}`);
console.info(`To merge the version update: git checkout dev && git mergeff ${currentBranch} && git push && git checkout ${currentBranch}`);
}
main().catch((error) => {

5
packages/tools/tool-utils.ts
View File

@ -335,6 +335,11 @@ export async function gitPullTry(ignoreIfNotBranch = true) {
}
}
export const gitCurrentBranch = async (): Promise<string> => {
const output = await execCommand2('git rev-parse --abbrev-ref HEAD', { quiet: true });
return output.trim();
};
export async function githubUsername(email: string, name: string) {
const cache = await loadGitHubUsernameCache();
const cacheKey = `${email}:${name}`;