Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: if no previous prod release, return 1.0.0 if no prerelease #184

Merged
merged 2 commits into from
Oct 9, 2024
Merged

fix: if no previous prod release, return 1.0.0 if no prerelease #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea7738a
fix: clean up and organize logs
stdavis Oct 9, 2024
7665d34
fix: if no previous prod release, return 1.0.0 if no prerelease
stdavis Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { getLatestRelease, getNewVersion } from './utils.js';

async function run() {
try {
core.startGroup('Finding last tag...');
core.info('Finding last tag...');

// get the last tag
const octokit = github.getOctokit(core.getInput('repo-token'));
Expand Down Expand Up @@ -70,24 +70,28 @@ async function run() {

core.setOutput('current-version-number', currentVersion);

core.info(`latest release ${latestRelease ?? 'first release'}`);
core.endGroup();

// pass an object rather than a string to make sure that it gets included in the build
const bumper = new Bumper(process.cwd()).loadPreset('angular');
const recommendation = await bumper.bump();
core.info(`conventional release type ${recommendation.releaseType}`);

const prerelease = core.getBooleanInput('prerelease');

// these are helpful in diagnosing issues and adding new test cases
core.info(`latest tag: ${latestRelease ?? 'first release'}`);
core.info(`conventional release type ${recommendation.releaseType}`);
core.info(`prerelease: ${prerelease}`);
core.info(`latest prod release: ${latestProdRelease}`);

core.info(`current-version-number (output): ${currentVersion}`);

const newVersion = getNewVersion(
latestRelease,
recommendation.releaseType as string,
prerelease,
latestProdRelease as string,
);

core.info(`prerelease: ${prerelease}`);
core.info(`next version: ${newVersion}`);
core.info(`version (output): ${newVersion}`);

core.setOutput('version', newVersion);
if (newVersion) {
Expand Down
1 change: 1 addition & 0 deletions src/utils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ describe('getNewVersion', () => {
['0.1.0-0', 'minor', true, null, '0.1.0-1'],
['2.0.0-5', 'minor', false, '1.3.4', '1.4.0'],
[null, 'patch', false, null, '1.0.0'],
['1.0.0-3', 'patch', false, null, '1.0.0'],
];

test.each(cases)('%s, %s, %j, %s => %s', (lastTag, bumpType, prerelease, lastProdTag, expectation) => {
Expand Down
6 changes: 5 additions & 1 deletion src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ export function getNewVersion(
return prerelease ? '1.0.0-0' : '1.0.0';
}

if (!prerelease && !lastProdTag) {
return '1.0.0';
}

/* If the last tag was a major prerelease, we shouldn't
bump anything but the prerelease number. For example, if the
last tag was 2.0.0-0 and this is a minor bump, we should
Expand All @@ -29,7 +33,7 @@ export function getNewVersion(

const releaseType = getReleaseType(lastTag, conventionalReleaseType, prerelease, lastProdTag);

return semver.inc(prerelease ? lastTag : lastProdTag ?? '0.0.0', releaseType, prerelease);
return semver.inc(prerelease ? lastTag : lastProdTag ?? '1.0.0', releaseType, prerelease);
}

function getReleaseType(
Expand Down