1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-24 10:27:10 +02:00

Tools: Fixed server tags

This commit is contained in:
Laurent Cozic 2021-09-29 16:49:59 +01:00
parent 6a22fb51f3
commit 883ebe69cc
2 changed files with 8 additions and 8 deletions

View File

@ -30,7 +30,8 @@ async function main() {
const buildArgs = `--build-arg BUILD_DATE="${buildDate}" --build-arg REVISION="${revision}" --build-arg VERSION="${imageVersion}"`;
const dockerTags: string[] = [];
const versionPart = imageVersion.split('.');
dockerTags.push(isPreRelease ? 'beta' : 'latest');
// dockerTags.push(isPreRelease ? 'beta' : 'latest');
dockerTags.push('beta');
dockerTags.push(versionPart[0] + (isPreRelease ? '-beta' : ''));
dockerTags.push(`${versionPart[0]}.${versionPart[1]}${isPreRelease ? '-beta' : ''}`);
dockerTags.push(imageVersion);

View File

@ -3,9 +3,11 @@ import { execCommand2, rootDir, gitPullTry, completeReleaseWithChangelog } from
const serverDir = `${rootDir}/packages/server`;
async function main() {
const argv = require('yargs').argv;
if (!['release', 'prerelease'].includes(argv.type)) throw new Error('Must specify release type. Either --type=release or --type=prerelease');
const isPreRelease = argv.type === 'prerelease';
// const argv = require('yargs').argv;
// if (!['release', 'prerelease'].includes(argv.type)) throw new Error('Must specify release type. Either --type=release or --type=prerelease');
// const isPreRelease = argv.type === 'prerelease';
const isPreRelease = false;
await gitPullTry();
@ -16,10 +18,7 @@ async function main() {
const changelogPath = `${rootDir}/readme/changelog_server.md`;
// We don't mark the changelog entry as pre-release because they all are
// initially. It's only after a number of days once it's clear that the
// release is stable that it is marked as "latest".
await completeReleaseWithChangelog(changelogPath, version, tagName, 'Server', false);
await completeReleaseWithChangelog(changelogPath, version, tagName, 'Server', isPreRelease);
}
main().catch((error) => {