From 125f34b8b45ea01cfb7a4da42a111937e9d61300 Mon Sep 17 00:00:00 2001 From: Emanuele Stoppa Date: Thu, 23 May 2024 07:49:25 +0100 Subject: [PATCH] ci: fix nightly version and restore update of manifest (#2953) --- .../biome/scripts/generate-packages.mjs | 29 +++++++++++++++++++ .../biome/scripts/update-nightly-version.mjs | 6 ++-- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/packages/@biomejs/biome/scripts/generate-packages.mjs b/packages/@biomejs/biome/scripts/generate-packages.mjs index adffa1801926..b3f203674ef0 100644 --- a/packages/@biomejs/biome/scripts/generate-packages.mjs +++ b/packages/@biomejs/biome/scripts/generate-packages.mjs @@ -20,6 +20,35 @@ function copyBinaryToNativePackage(platform, arch) { const os = platform.split("-")[0]; const buildName = getName(platform, arch); const packageRoot = resolve(PACKAGES_ROOT, buildName); + const packageName = `@biomejs/${buildName}`; + + // Update the package.json manifest + const { version, license, repository, engines, homepage } = rootManifest; + + const manifest = JSON.stringify( + { + name: packageName, + version, + license, + repository, + engines, + homepage, + os: [os], + cpu: [arch], + libc: + os === "linux" + ? packageName.endsWith("musl") + ? ["musl"] + : ["glibc"] + : undefined, + }, + null, + 2, + ); + + const manifestPath = resolve(packageRoot, "package.json"); + console.log(`Update manifest ${manifestPath}`); + fs.writeFileSync(manifestPath, manifest); // Copy the CLI binary const ext = os === "win32" ? ".exe" : ""; diff --git a/packages/@biomejs/biome/scripts/update-nightly-version.mjs b/packages/@biomejs/biome/scripts/update-nightly-version.mjs index f5535bc841e8..9404add15dca 100644 --- a/packages/@biomejs/biome/scripts/update-nightly-version.mjs +++ b/packages/@biomejs/biome/scripts/update-nightly-version.mjs @@ -2,8 +2,8 @@ import * as fs from "node:fs"; import { resolve } from "node:path"; import { fileURLToPath } from "node:url"; -const ROMECLI_ROOT = resolve(fileURLToPath(import.meta.url), "../.."); -const MANIFEST_PATH = resolve(ROMECLI_ROOT, "package.json"); +const BIOME_CLI_ROOT = resolve(fileURLToPath(import.meta.url), "../.."); +const MANIFEST_PATH = resolve(BIOME_CLI_ROOT, "package.json"); const rootManifest = JSON.parse( fs.readFileSync(MANIFEST_PATH).toString("utf-8"), @@ -14,7 +14,7 @@ let [major, minor, patch] = rootManifest.version .map((num) => Number.parseInt(num)); // increment patch version patch += 1; -let version = rootManifest.version; +let version = `${major}.${minor}.${patch}`; if ( typeof process.env.GITHUB_SHA !== "string" ||