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

Jump to bottom

Fixing releases to also mark SIPs as released #1546

Merged
merged 1 commit into from
Oct 4, 2021
Merged

Fixing releases to also mark SIPs as released #1546

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 25 additions & 2 deletions publish/src/commands/finalize-release.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ const finalizeRelease = async ({ layer, release, versionTag }) => {
await versionsUpdate({ release, useOvm: true, versionTag });
}

const prerelease = semver.prerelease(versionTag) && semver.prerelease(versionTag) !== 'ovm';
const prerelease = semver.prerelease(versionTag) && semver.prerelease(versionTag)[0] !== 'ovm';
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this was the bug - semver.prerelease was returning an array

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are we certain that semver.prerelease(versionTag)[0] is not null? otherwise the functionality would not be exactly the same as before.


if (prerelease) {
console.log(
'Not updating the releases.json as this is a prerelease of',
semver.prerelease(versionTag)
semver.prerelease(versionTag)[0]
);
return;
}
Expand All @@ -40,13 +40,36 @@ const finalizeRelease = async ({ layer, release, versionTag }) => {
const major = semver.major(versionTag);
const minor = semver.minor(versionTag);

let sips = [];
// Mark as released the ones that have the specified version and layer
for (const release of releases.releases) {
const versionMatch = release.version.major === major && release.version.minor === minor;
const layerMatch = (release.ovm && isOvm) || (!release.ovm && isBase);

if (versionMatch && layerMatch) {
release.released = true;
sips = sips.concat(release.sips);
}
}

// now mark all sips as released on that layer
for (const sipNumber of sips) {
const sip = releases.sips.find(s => s.sip === sipNumber);
if (!sip) {
console.log(
'WARNING: Cannot find entry for SIP',
sipNumber,
'and thus cannot update its releasability'
);
continue;
}
// when it's the first release of the sip, or if the new release is both, then
// use the given layer
if (!sip.released || layer === 'both') {
sip.released = layer;
// else when releasing the other layer, then mark both released
} else if (sip.released !== layer) {
sip.released = 'both';
}
}

Expand Down