fix: look also for previous prerelease versions to determine the next one
This commit is contained in:
		
							parent
							
								
									61665be9ec
								
							
						
					
					
						commit
						9772563a22
					
				| @ -14,7 +14,9 @@ module.exports = ({branch, nextRelease: {type, channel}, lastRelease, logger}) = | |||||||
|       ) { |       ) { | ||||||
|         version = highest( |         version = highest( | ||||||
|           semver.inc(lastRelease.version, 'prerelease'), |           semver.inc(lastRelease.version, 'prerelease'), | ||||||
|           `${semver.inc(getLatestVersion(tagsToVersions(branch.tags)), type)}-${branch.prerelease}.${FIRSTPRERELEASE}` |           `${semver.inc(getLatestVersion(tagsToVersions(branch.tags), {withPrerelease: true}), type)}-${ | ||||||
|  |             branch.prerelease | ||||||
|  |           }.${FIRSTPRERELEASE}` | ||||||
|         ); |         ); | ||||||
|       } else { |       } else { | ||||||
|         version = `${semver.inc(`${major}.${minor}.${patch}`, type)}-${branch.prerelease}.${FIRSTPRERELEASE}`; |         version = `${semver.inc(`${major}.${minor}.${patch}`, type)}-${branch.prerelease}.${FIRSTPRERELEASE}`; | ||||||
|  | |||||||
| @ -258,3 +258,20 @@ test('Increase version for release on prerelease branch based on highest commit | |||||||
|     '2.0.0-beta.1' |     '2.0.0-beta.1' | ||||||
|   ); |   ); | ||||||
| }); | }); | ||||||
|  | 
 | ||||||
|  | test('Increase version for release on prerelease branch when there is no regular releases on other branches', t => { | ||||||
|  |   t.is( | ||||||
|  |     getNextVersion({ | ||||||
|  |       branch: { | ||||||
|  |         name: 'beta', | ||||||
|  |         type: 'prerelease', | ||||||
|  |         prerelease: 'beta', | ||||||
|  |         tags: [{gitTag: 'v1.0.0-beta.1', version: '1.0.0-beta.1', channels: ['beta']}], | ||||||
|  |       }, | ||||||
|  |       nextRelease: {type: 'minor', channel: 'beta'}, | ||||||
|  |       lastRelease: {version: 'v1.0.0-beta.1', channels: ['beta']}, | ||||||
|  |       logger: t.context.logger, | ||||||
|  |     }), | ||||||
|  |     '1.0.0-beta.2' | ||||||
|  |   ); | ||||||
|  | }); | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user