Skip to content

Do not show beta with same patch as latest stable #144

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

Merged
sverhoeven merged 3 commits into from
Apr 10, 2026
Merged

Do not show beta with same patch as latest stable #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9764ecb
Do not show beta with same patch as latest stable
sverhoeven Apr 10, 2026
85a8146
Words are hard
sverhoeven Apr 10, 2026
fded60b
More test cases and clearer titles
sverhoeven Apr 10, 2026
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
33 changes: 22 additions & 11 deletions src/releaseStats.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,9 @@ export function resolveReleaseStats(
const installedIsPreRelease =
installedVersion && isPreRelease(installedVersion);
let latestVersionIs: ReleaseStats['latestVersionIs'];
const latestPreReleaseSamePatchAsLatestStable =
!!latestStableReleaseVersion &&
isSamePatchVersion(latestStableReleaseVersion, latestPreReleaseVersion);
if (installedVersion) {
latestVersionIs = 'installed';
if (canUpdateToStable && !latestPreReleaseIsNewerThanStable) {
Expand Down Expand Up @@ -228,18 +231,26 @@ export function resolveReleaseStats(
}
if (options.allowPreRelease && preReleaseAsset && latestPreReleaseVersion) {
if (!installedVersion) {
actions.push({
type: 'install-pre-release',
asset: preReleaseAsset,
to: latestPreReleaseVersion,
});
if (latestPreReleaseSamePatchAsLatestStable) {
// do not offer pre-release with same patch version as stable
} else {
actions.push({
type: 'install-pre-release',
asset: preReleaseAsset,
to: latestPreReleaseVersion,
});
}
} else if (canUpdateToPreRelease) {
actions.push({
type: 'update-pre-release',
asset: preReleaseAsset,
to: latestPreReleaseVersion,
from: installedVersion,
});
if (latestPreReleaseSamePatchAsLatestStable) {
// do not offer pre-release with same patch version as stable
} else {
Comment thread
sverhoeven marked this conversation as resolved.
actions.push({
type: 'update-pre-release',
asset: preReleaseAsset,
to: latestPreReleaseVersion,
from: installedVersion,
});
}
}
}

Expand Down
89 changes: 82 additions & 7 deletions src/releaseStats.unit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ describe('resolveReleaseStats', () => {
},
],
[
'Pre→stable (newer pre available)',
'Pre→stable (newer pre available + stable same patch version)',
{
installed: '1.0.0-beta.1',
stableRelease: '1.0.0-release.0',
Expand All @@ -446,12 +446,6 @@ describe('resolveReleaseStats', () => {
from: '1.0.0-beta.1',
to: '1.0.0-release.0',
},
{
type: 'update-pre-release',
asset: preAsset,
from: '1.0.0-beta.1',
to: '1.0.0-beta.2',
},
{
type: 'uninstall-pre-release',
from: '1.0.0-beta.1',
Expand Down Expand Up @@ -751,6 +745,87 @@ describe('resolveReleaseStats', () => {
latestStableRelease: release('1.2.0-release.0', 'stable'),
},
],
[
'Latest pre same version as stable, nothing installed',
{
installed: undefined,
stableRelease: '0.96.1-release.12',
preRelease: '0.96.1-beta.1',
allowPreRelease: true,
removeable: true,
},
{
actions: [
{
type: 'install-stable',
asset: stableAsset,
to: '0.96.1-release.12',
},
],
latestVersionIs: 'stable',
installedVersion: undefined,
latestPreRelease: release('0.96.1-beta.1', 'pre-release'),
latestStableRelease: release('0.96.1-release.12', 'stable'),
},
],
[
'Latest pre same version as stable, older stable installed',
{
installed: '0.96.0-release.0',
stableRelease: '0.96.1-release.12',
preRelease: '0.96.1-beta.1',
allowPreRelease: true,
removeable: true,
},
{
actions: [
{
type: 'update-stable',
asset: stableAsset,
from: '0.96.0-release.0',
to: '0.96.1-release.12',
},
{
type: 'uninstall',
from: '0.96.0-release.0',
moduleId: 'jaspAcceptanceSampling',
},
],
latestVersionIs: 'stable',
installedVersion: '0.96.0-release.0',
latestPreRelease: release('0.96.1-beta.1', 'pre-release'),
latestStableRelease: release('0.96.1-release.12', 'stable'),
},
],
[
'Latest pre same version as stable, older beta installed',
{
installed: '0.96.0-beta.0',
stableRelease: '0.96.1-release.12',
preRelease: '0.96.1-beta.1',
allowPreRelease: true,
removeable: true,
},
{
actions: [
{
type: 'update-stable',
asset: stableAsset,
from: '0.96.0-beta.0',
to: '0.96.1-release.12',
},
{
type: 'uninstall-pre-release',
from: '0.96.0-beta.0',
moduleId: 'jaspAcceptanceSampling',
},
],
latestVersionIs: 'stable',
installedVersion: '0.96.0-beta.0',
latestPreRelease: release('0.96.1-beta.1', 'pre-release'),
latestStableRelease: release('0.96.1-release.12', 'stable'),
},
],
])('$0', ([_summary, given, expected]) => {
const repo: Repository = {
id: 'jaspAcceptanceSampling',
Expand Down
Loading