From a22fffc8b532bbc4c8a3452ff48ee64055e51328 Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Tue, 10 Jun 2025 14:32:29 +0200 Subject: [PATCH] release: fix the script --- scripts/release | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/scripts/release b/scripts/release index c116d705f..d039bd3e5 100755 --- a/scripts/release +++ b/scripts/release @@ -167,10 +167,10 @@ async function edit(options) { const env = ENVIRONMENTS[options.env]; if (!env) return exit(new Error(`Unknown environment ${options.env}`)); - const [error, result] = await safe(superagent.get(env.url)); - if (error || result.error) return exit(error || result.error); + const [error, response] = await safe(superagent.get(env.url)); + if (error) return exit(`Network error getting ${env.url}: ${error.message}`); - const oldContents = result.type === 'application/json' ? JSON.stringify(result.body, null, 4) : result.text; + const oldContents = response.text; const tmpfile = path.join(os.tmpdir(), 'versions.json'); await fs.promises.writeFile(tmpfile, oldContents); @@ -219,9 +219,9 @@ async function createRelease(options) { const email = execSync('git config user.email').toString('utf8').trim(); const [error, response] = await safe(superagent.get(env.url)); - if (error || response.error) return exit(error || response.error); + if (error) return exit(`Networking error getting ${env.url}: ${error.message}`); - const releases = response.type === 'application/json' ? response.body : safe.JSON.parse(response.text); + const releases = response.body; if (!releases) return exit(new Error('versions.json is not valid JSON')); @@ -317,7 +317,7 @@ async function listRelease(options) { const raw = !!options.raw, releaseFilenames = !!options.releaseFilenames, releaseUrls = !!options.releaseUrls; const [error, response] = await safe(superagent.get(env.url)); - if (error || response.error) return exit(error || response.error); + if (error) return exit(`Network error getting ${env.url}: ${error.message}`); const releases = response.body; if (raw) { @@ -343,10 +343,6 @@ async function listRelease(options) { return exit(); } - if (response.type !== 'application/json') { - return exit(new Error('Release file is not valid JSON!')); - } - if (Object.keys(releases).length === 0) { console.log('No releases'); return exit();