From f2cd8b73fa216a08d5d0eb5e5e047eeb86e5ff09 Mon Sep 17 00:00:00 2001 From: Miles Johnson Date: Mon, 13 Feb 2023 11:02:09 -0800 Subject: [PATCH] build: Fix invalid version bump. --- .yarn/versions/dc7ddc8e.yml | 16 ++++++++-------- scripts/version/applyAndTagVersions.mjs | 22 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/.yarn/versions/dc7ddc8e.yml b/.yarn/versions/dc7ddc8e.yml index db3714060c1..333ea2c8bf7 100644 --- a/.yarn/versions/dc7ddc8e.yml +++ b/.yarn/versions/dc7ddc8e.yml @@ -1,12 +1,12 @@ releases: - '@moonrepo/cli': major - '@moonrepo/core-linux-arm64-gnu': major - '@moonrepo/core-linux-arm64-musl': major - '@moonrepo/core-linux-x64-gnu': major - '@moonrepo/core-linux-x64-musl': major - '@moonrepo/core-macos-arm64': major - '@moonrepo/core-macos-x64': major - '@moonrepo/core-windows-x64-msvc': major + '@moonrepo/cli': minor + '@moonrepo/core-linux-arm64-gnu': minor + '@moonrepo/core-linux-arm64-musl': minor + '@moonrepo/core-linux-x64-gnu': minor + '@moonrepo/core-linux-x64-musl': minor + '@moonrepo/core-macos-arm64': minor + '@moonrepo/core-macos-x64': minor + '@moonrepo/core-windows-x64-msvc': minor '@moonrepo/types': patch declined: diff --git a/scripts/version/applyAndTagVersions.mjs b/scripts/version/applyAndTagVersions.mjs index 707af001273..672267f60bb 100644 --- a/scripts/version/applyAndTagVersions.mjs +++ b/scripts/version/applyAndTagVersions.mjs @@ -2,6 +2,10 @@ import { existsSync } from 'fs'; import fs from 'fs/promises'; import chalk from 'chalk'; import { execa } from 'execa'; +// eslint-disable-next-line import/no-unresolved +import readline from 'readline/promises'; + +const rl = readline.createInterface({ input: process.stdin, output: process.stdout }); async function getPackageVersions() { const files = await fs.readdir('packages'); @@ -96,6 +100,16 @@ async function createTags(versions) { ); } +async function resetGit() { + await execa('git', ['reset', '--hard']); +} + +function versionString(versions) { + return Object.entries(versions) + .map(([key, value]) => `${key}@${value}`) + .join(', '); +} + async function run() { // Delete local builds so we dont inadvertently release it await removeLocalBuilds(); @@ -109,6 +123,14 @@ async function run() { // Now gather the versions again so we can diff const nextVersions = await getPackageVersions(); + const answer = await rl.question(`Release (Y/n)?\n${chalk.gray(versionString(nextVersions))}\n`); + + if (answer.toLocaleLowerCase() === 'n') { + rl.close(); + await resetGit(); + return; + } + // Diff the versions and find the new ones const diff = [];