simon/semantic-release
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: exclude prereleases from version retrived by getLastRelease

Browse Source
This commit is contained in:
Pierre Vanduynslager 2018-03-08 11:22:55 -05:00 committed by Gregor Martynus
parent e5a73d8628
commit e4618a2fbc
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/get-last-release.js
View File

@ -33,7 +33,9 @@ module.exports = async (tagFormat, logger) => {
.map(tag => { .map(tag => {
return {gitTag: tag, version: (tag.match(tagRegexp) || new Array(2))[1]}; return {gitTag: tag, version: (tag.match(tagRegexp) || new Array(2))[1]};
}) })
.filter(tag => tag.version && semver.valid(semver.clean(tag.version))) .filter(
tag => tag.version && semver.valid(semver.clean(tag.version)) && !semver.prerelease(semver.clean(tag.version))
)
.sort((a, b) => semver.rcompare(a.version, b.version)); .sort((a, b) => semver.rcompare(a.version, b.version));
debug('found tags: %o', tags); debug('found tags: %o', tags);

11
test/get-last-release.test.js
View File

@ -17,7 +17,7 @@ test.afterEach.always(() => {
process.chdir(cwd); process.chdir(cwd);
}); });
test.serial('Get the highest valid tag', async t => { test.serial('Get the highest non-prerelease valid tag', async t => {
// Create a git repository, set the current working directory at the root of the repo // Create a git repository, set the current working directory at the root of the repo
await gitRepo(); await gitRepo();
// Create some commits and tags // Create some commits and tags
@ -29,6 +29,8 @@ test.serial('Get the highest valid tag', async t => {
await gitTagVersion('v1.0.0'); await gitTagVersion('v1.0.0');
await gitCommits(['Fourth']); await gitCommits(['Fourth']);
await gitTagVersion('v3.0'); await gitTagVersion('v3.0');
await gitCommits(['Fifth']);
await gitTagVersion('v3.0.0-beta.1');
const result = await getLastRelease(`v\${version}`, t.context.logger); const result = await getLastRelease(`v\${version}`, t.context.logger);
@ -117,4 +119,11 @@ test.serial('Get the highest valid tag corresponding to the "tagFormat"', async
gitTag: '2.0.0-1.0.0-bar.1', gitTag: '2.0.0-1.0.0-bar.1',
version: '1.0.0', version: '1.0.0',
}); });
await gitTagVersion('3.0.0-bar.1');
t.deepEqual(await getLastRelease(`\${version}-bar.1`, t.context.logger), {
gitHead,
gitTag: '3.0.0-bar.1',
version: '3.0.0',
});
}); });