Merge 29985b169f into fc06bc1257

.github/workflows/pr-check.yaml

@@ -1,28 +0,0 @@
-name: pr-check
-
-on: [ pull_request ]
-
-permissions:
-  contents: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
-  cancel-in-progress: true
-
-jobs:
-  check-dist:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
-
-      - name: Setup pnpm
-        uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0
-        with:
-          run_install: true
-          version: 9
-
-      - name: Update dist/index.js
-        run: pnpm run build
-
-      - name: Check for uncommitted changes in dist
-        run: git diff --exit-code dist/index.js

src/install-pnpm/index.ts

@@ -1,16 +1,27 @@
-import { setFailed, startGroup, endGroup } from '@actions/core'
-import { Inputs } from '../inputs'
-import runSelfInstaller from './run'
+import { setFailed, startGroup, endGroup } from "@actions/core";
+import { Inputs } from "../inputs";
+import runSelfInstaller from "./run";
+import { exec } from "child_process";
+import { promisify } from "util";
 
-export { runSelfInstaller }
+export { runSelfInstaller };
+const execAsync = promisify(exec);
 
 export async function install(inputs: Inputs) {
-  startGroup('Running self-installer...')
-  const status = await runSelfInstaller(inputs)
-  endGroup()
+  try {
+    await execAsync("pnpm --version");
+    return;
+  } catch {}
+
+  startGroup("Running self-installer...");
+  const status = await runSelfInstaller(inputs);
+  endGroup();
+
   if (status) {
-    return setFailed(`Something went wrong, self-installer exits with code ${status}`)
+    return setFailed(
+      `Something went wrong, self-installer exits with code ${status}`,
+    );
   }
 }
 
-export default install
+export default install;

src/install-pnpm/run.ts

@@ -44,7 +44,6 @@ export async function runSelfInstaller(inputs: Inputs): Promise<number> {
   if (exitCode === 0) {
     const pnpmHome = path.join(dest, 'node_modules/.bin')
     addPath(pnpmHome)
-    addPath(path.join(pnpmHome, 'bin'))
     exportVariable('PNPM_HOME', pnpmHome)
   }
   return exitCode

src/utils/index.ts

@@ -6,5 +6,5 @@ export const getBinDest = (inputs: Inputs): string => path.join(inputs.dest, 'no
 
 export const patchPnpmEnv = (inputs: Inputs): NodeJS.ProcessEnv => ({
   ...process.env,
-  PATH: path.join(getBinDest(inputs), 'bin') + path.delimiter + getBinDest(inputs) + path.delimiter + process.env.PATH,
+  PATH: getBinDest(inputs) + path.delimiter + process.env.PATH,
 })