From aca0f5b60e1aa615cff29180e3de2a3cc7411866 Mon Sep 17 00:00:00 2001 From: Thijs Koerselman Date: Sun, 9 Jun 2024 17:11:19 +0200 Subject: [PATCH 1/3] Only detect version for expected package manager --- src/lib/package-manager/helpers/infer-from-files.ts | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/lib/package-manager/helpers/infer-from-files.ts b/src/lib/package-manager/helpers/infer-from-files.ts index d33c19a..5814d9f 100644 --- a/src/lib/package-manager/helpers/infer-from-files.ts +++ b/src/lib/package-manager/helpers/infer-from-files.ts @@ -9,10 +9,16 @@ export function inferFromFiles(workspaceRoot: string): PackageManager { for (const name of supportedPackageManagerNames) { const lockfileName = getLockfileFileName(name); - const version = getVersion(name); - if (fs.existsSync(path.join(workspaceRoot, lockfileName))) { - return { name, version, majorVersion: getMajorVersion(version) }; + try { + const version = getVersion(name); + + return { name, version, majorVersion: getMajorVersion(version) }; + } catch (err) { + throw new Error( + `Failed to find package manager version for ${name}: ${err}` + ); + } } } From af2d7282fa67bc37ade8890a1db72a129df9161a Mon Sep 17 00:00:00 2001 From: Thijs Koerselman Date: Sun, 9 Jun 2024 17:20:53 +0200 Subject: [PATCH 2/3] Only throw the error message --- src/lib/package-manager/helpers/infer-from-files.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/package-manager/helpers/infer-from-files.ts b/src/lib/package-manager/helpers/infer-from-files.ts index 5814d9f..852047e 100644 --- a/src/lib/package-manager/helpers/infer-from-files.ts +++ b/src/lib/package-manager/helpers/infer-from-files.ts @@ -1,6 +1,7 @@ import fs from "fs-extra"; import { execSync } from "node:child_process"; import path from "node:path"; +import { getErrorMessage } from "~/lib/utils"; import { getMajorVersion } from "~/lib/utils/get-major-version"; import type { PackageManager, PackageManagerName } from "../names"; import { getLockfileFileName, supportedPackageManagerNames } from "../names"; @@ -16,7 +17,7 @@ export function inferFromFiles(workspaceRoot: string): PackageManager { return { name, version, majorVersion: getMajorVersion(version) }; } catch (err) { throw new Error( - `Failed to find package manager version for ${name}: ${err}` + `Failed to find package manager version for ${name}: ${getErrorMessage(err)}` ); } } From 695fbaafa06fa29490ec3297e80baeb775d1fc56 Mon Sep 17 00:00:00 2001 From: Thijs Koerselman Date: Sun, 9 Jun 2024 18:30:55 +0200 Subject: [PATCH 3/3] Update github actions --- .github/workflows/main.yaml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index d4b80a7..1e858ba 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -7,18 +7,12 @@ on: jobs: everything: runs-on: ubuntu-latest - strategy: - matrix: - node-version: [18] steps: - - uses: actions/checkout@v3 - - uses: pnpm/action-setup@v2 + - uses: actions/checkout@v4 + - uses: pnpm/action-setup@v3 + - uses: actions/setup-node@v4 with: - version: 8 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node-version }} + node-version: 20 cache: "pnpm" - name: Install dependencies run: pnpm install