Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"build": "astro build",
"preview": "astro preview",
"check": "astro check",
"test": "node --test src/remark-rewrite-doc-links.test.mjs src/astro-config.test.mjs scripts/release-metadata.test.mjs scripts/release-homebrew-formula.test.mjs scripts/install.test.mjs scripts/forkpress-launcher.test.mjs",
"test": "node --test src/remark-rewrite-doc-links.test.mjs src/astro-config.test.mjs scripts/release-metadata.test.mjs scripts/release-prepare.test.mjs scripts/release-homebrew-formula.test.mjs scripts/install.test.mjs scripts/forkpress-launcher.test.mjs",
"release:prepare": "node scripts/release-prepare.mjs",
"release:validate": "node scripts/release-validate.mjs",
"validate": "npm run check && npm run test && npm run build"
Expand Down
24 changes: 16 additions & 8 deletions scripts/release-prepare.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -140,22 +140,30 @@ function remoteRefExists(args) {
}

function requireExpectedChanges(initialChangedFiles) {
const status = runOutput('git', ['status', '--porcelain']).trim();
if (status === '') {
const status = runOutput('git', ['status', '--porcelain']);
requireChangedReleaseFiles([...initialChangedFiles, cargoLock], status);
}

export function requireChangedReleaseFiles(expectedFiles, status) {
if (status.trim() === '') {
throw new ReleaseMetadataError('Release metadata is already at the requested version.');
}

const changedFiles = new Set(
const changedFiles = changedFilesFromStatus(status);
for (const file of expectedFiles) {
if (!changedFiles.has(file)) {
throw new ReleaseMetadataError(`Expected release file was not changed: ${file}`);
}
}
}

export function changedFilesFromStatus(status) {
return new Set(
status
.split('\n')
.map((line) => line.slice(3))
.filter(Boolean),
);
for (const file of [...initialChangedFiles, cargoLock]) {
if (!changedFiles.has(file)) {
throw new ReleaseMetadataError(`Expected release file was not changed: ${file}`);
}
}
}

function run(command, args, options = {}) {
Expand Down
34 changes: 34 additions & 0 deletions scripts/release-prepare.test.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import assert from 'node:assert/strict';
import test from 'node:test';

import {
ReleaseMetadataError,
cargoLock,
installerManifest,
productionCrateManifests,
} from './release-metadata.mjs';
import { changedFilesFromStatus, requireChangedReleaseFiles } from './release-prepare.mjs';

test('parses changed files from git status porcelain output', () => {
assert.deepEqual(
[...changedFilesFromStatus(' M Cargo.lock\nM crates/forkpress-cli/Cargo.toml\n')],
['Cargo.lock', 'crates/forkpress-cli/Cargo.toml'],
);
});

test('requires release metadata and Cargo.lock to be dirty', () => {
const expectedFiles = [...productionCrateManifests, installerManifest, cargoLock];
const status = expectedFiles.map((path) => ` M ${path}`).join('\n');

assert.doesNotThrow(() => requireChangedReleaseFiles(expectedFiles, status));
});

test('rejects release prepare when an edited metadata file is missing from git status', () => {
const [missingFile, ...changedFiles] = productionCrateManifests;
const status = [...changedFiles, installerManifest, cargoLock].map((path) => ` M ${path}`).join('\n');

assert.throws(
() => requireChangedReleaseFiles([missingFile, ...changedFiles, installerManifest, cargoLock], status),
ReleaseMetadataError,
);
});
Loading