mirror of
https://github.com/pnpm/action-setup.git
synced 2026-05-15 06:43:32 +08:00
Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b635341b3e | ||
|
|
025de3876f | ||
|
|
5c388c2b3b | ||
|
|
84fa52c3d7 | ||
|
|
07ad39cba4 | ||
|
|
052c4ffb7d | ||
|
|
91ab88e261 |
332
.github/workflows/test.yaml
vendored
332
.github/workflows/test.yaml
vendored
@@ -1,43 +1,73 @@
|
|||||||
name: Test Action
|
name: Test Action
|
||||||
|
|
||||||
on:
|
on:
|
||||||
- push
|
pull_request:
|
||||||
- pull_request
|
push:
|
||||||
- workflow_dispatch
|
branches:
|
||||||
|
- master
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
test_default_inputs:
|
smoke:
|
||||||
name: Test with default inputs
|
# Cross-OS coverage. Exercises the bootstrap install + PATH on each platform,
|
||||||
|
# the version-respects-request regression (#225 / #230 — Windows PATH shadow),
|
||||||
|
# and the bin_dest output regression (#247). Multi-version coverage on Linux
|
||||||
|
# so we don't pay 3x for major-version differences.
|
||||||
|
name: 'Smoke (${{ matrix.name }})'
|
||||||
|
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
pnpm:
|
include:
|
||||||
- 9.15.5
|
- name: 'ubuntu / v9.15.5'
|
||||||
os:
|
os: ubuntu-latest
|
||||||
- ubuntu-latest
|
version: '9.15.5'
|
||||||
- macos-latest
|
- name: 'ubuntu / v10.33.0'
|
||||||
- windows-latest
|
os: ubuntu-latest
|
||||||
|
version: '10.33.0'
|
||||||
|
- name: 'ubuntu / v9.15.5 / custom-dest'
|
||||||
|
os: ubuntu-latest
|
||||||
|
version: '9.15.5'
|
||||||
|
dest: '~/test/pnpm'
|
||||||
|
- name: 'macos / v9.15.5'
|
||||||
|
os: macos-latest
|
||||||
|
version: '9.15.5'
|
||||||
|
- name: 'windows / v9.15.5'
|
||||||
|
os: windows-latest
|
||||||
|
version: '9.15.5'
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
|
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
|
||||||
|
|
||||||
- name: Run the action
|
- id: pnpm
|
||||||
|
name: Run the action
|
||||||
uses: ./
|
uses: ./
|
||||||
with:
|
with:
|
||||||
version: 9.15.5
|
version: ${{ matrix.version }}
|
||||||
|
dest: ${{ matrix.dest || '~/setup-pnpm' }}
|
||||||
|
|
||||||
- name: 'Test: which'
|
- name: 'Test: pnpm/pnpx on PATH report the requested version (incl. via bin_dest)'
|
||||||
run: which pnpm; which pnpx
|
# Pass paths via env, not template interpolation, so Windows
|
||||||
|
# backslashes in `bin_dest` aren't eaten by bash's escape handling.
|
||||||
- name: 'Test: version'
|
env:
|
||||||
|
BIN_DEST: ${{ steps.pnpm.outputs.bin_dest }}
|
||||||
|
REQUIRED: ${{ matrix.version }}
|
||||||
run: |
|
run: |
|
||||||
|
set -e
|
||||||
|
which pnpm
|
||||||
|
which pnpx
|
||||||
actual="$(pnpm --version)"
|
actual="$(pnpm --version)"
|
||||||
echo "pnpm version: ${actual}"
|
echo "pnpm --version: ${actual}"
|
||||||
if [[ ! "${actual}" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-.+)?$ ]]; then
|
if [ "${actual}" != "${REQUIRED}" ]; then
|
||||||
echo "ERROR: pnpm --version did not produce valid output"
|
echo "Expected pnpm version ${REQUIRED}, but got ${actual}"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
bin_dest_version="$("$BIN_DEST/pnpm" --version)"
|
||||||
|
echo "bin_dest pnpm --version: ${bin_dest_version}"
|
||||||
|
if [ "${bin_dest_version}" != "${REQUIRED}" ]; then
|
||||||
|
echo "Expected ${REQUIRED} via bin_dest, but got ${bin_dest_version}"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
shell: bash
|
shell: bash
|
||||||
@@ -50,54 +80,95 @@ jobs:
|
|||||||
pnpm add is-odd
|
pnpm add is-odd
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
||||||
test_dest:
|
manifest_pin:
|
||||||
name: Test with dest
|
# Folds the old test_package_manager_field, test_dev_engines, and
|
||||||
|
# test_dev_engines_on_fail_error jobs. The action's manifest handling is
|
||||||
|
# OS-independent, so ubuntu-only is sufficient.
|
||||||
|
name: 'Manifest pin: ${{ matrix.label }}'
|
||||||
|
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
pnpm:
|
include:
|
||||||
- 9.15.5
|
- label: 'packageManager pnpm@9.15.5 (#227)'
|
||||||
os:
|
manifest: '{"packageManager":"pnpm@9.15.5"}'
|
||||||
- ubuntu-latest
|
version: '9.15.5'
|
||||||
- macos-latest
|
- label: 'packageManager pnpm@10.33.0'
|
||||||
- windows-latest
|
manifest: '{"packageManager":"pnpm@10.33.0"}'
|
||||||
|
version: '10.33.0'
|
||||||
|
- label: 'devEngines onFail=download, exact'
|
||||||
|
manifest: '{"devEngines":{"packageManager":{"name":"pnpm","version":"9.15.5","onFail":"download"}}}'
|
||||||
|
version: '9.15.5'
|
||||||
|
- label: 'devEngines onFail=download, range'
|
||||||
|
manifest: '{"devEngines":{"packageManager":{"name":"pnpm","version":">=9.15.0","onFail":"download"}}}'
|
||||||
|
version: '>=9.15.0'
|
||||||
|
- label: 'devEngines onFail=error, exact (#252)'
|
||||||
|
manifest: '{"devEngines":{"packageManager":{"name":"pnpm","version":"9.15.5","onFail":"error"}}}'
|
||||||
|
version: '9.15.5'
|
||||||
|
- label: 'devEngines onFail=error, range (#252)'
|
||||||
|
manifest: '{"devEngines":{"packageManager":{"name":"pnpm","version":">=9.15.0","onFail":"error"}}}'
|
||||||
|
version: '>=9.15.0'
|
||||||
|
- label: 'explicit version: pnpm_config_pm_on_fail not exported'
|
||||||
|
# Regression guard for the af8e203 scope fix: when the user passes an
|
||||||
|
# explicit `version:` input, the action must NOT export
|
||||||
|
# pnpm_config_pm_on_fail=download, so the user's strict onFail policy
|
||||||
|
# is preserved. Asserted directly on the env var rather than pnpm
|
||||||
|
# runtime behavior — different pnpm majors read devEngines
|
||||||
|
# differently (v10 ignores it, v11+ honors it).
|
||||||
|
manifest: '{"devEngines":{"packageManager":{"name":"pnpm","version":"9.15.5","onFail":"error"}}}'
|
||||||
|
explicit_version: '10.33.0'
|
||||||
|
expect_pm_on_fail_unset: true
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
|
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
|
||||||
|
|
||||||
|
- name: Set up package.json
|
||||||
|
run: echo '${{ matrix.manifest }}' > package.json
|
||||||
|
shell: bash
|
||||||
|
|
||||||
- name: Run the action
|
- name: Run the action
|
||||||
uses: ./
|
uses: ./
|
||||||
with:
|
with:
|
||||||
version: 9.15.5
|
version: ${{ matrix.explicit_version }}
|
||||||
dest: ~/test/pnpm
|
|
||||||
|
|
||||||
- name: 'Test: which'
|
- name: 'Test: pnpm reports the pinned version'
|
||||||
run: which pnpm && which pnpx
|
if: ${{ !matrix.expect_pm_on_fail_unset }}
|
||||||
|
env:
|
||||||
- name: 'Test: version'
|
REQUIRED: ${{ matrix.version }}
|
||||||
run: |
|
run: |
|
||||||
|
set -e
|
||||||
actual="$(pnpm --version)"
|
actual="$(pnpm --version)"
|
||||||
echo "pnpm version: ${actual}"
|
echo "pnpm version: ${actual}"
|
||||||
if [[ ! "${actual}" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-.+)?$ ]]; then
|
if [ "${REQUIRED}" = ">=9.15.0" ]; then
|
||||||
echo "ERROR: pnpm --version did not produce valid output"
|
min="9.15.0"
|
||||||
exit 1
|
if [ "$(printf '%s\n' "${min}" "${actual}" | sort -V | head -n1)" != "${min}" ]; then
|
||||||
|
echo "Expected pnpm version >= ${min}, but got ${actual}"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
if [ "${actual}" != "${REQUIRED}" ]; then
|
||||||
|
echo "Expected pnpm version ${REQUIRED}, but got ${actual}"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
||||||
test_standalone:
|
- name: 'Test: pnpm_config_pm_on_fail not exported (explicit version preserves strict policy)'
|
||||||
name: Test with standalone
|
if: ${{ matrix.expect_pm_on_fail_unset }}
|
||||||
|
run: |
|
||||||
|
if [ -n "${pnpm_config_pm_on_fail:-}" ]; then
|
||||||
|
echo "Expected pnpm_config_pm_on_fail to be unset, but got: '${pnpm_config_pm_on_fail}'"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "pnpm_config_pm_on_fail is unset, as expected"
|
||||||
|
shell: bash
|
||||||
|
|
||||||
runs-on: ${{ matrix.os }}
|
standalone:
|
||||||
|
name: Standalone mode
|
||||||
|
|
||||||
strategy:
|
runs-on: ubuntu-latest
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
os:
|
|
||||||
- ubuntu-latest
|
|
||||||
- windows-latest
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
|
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
|
||||||
@@ -108,167 +179,29 @@ jobs:
|
|||||||
version: 9.15.0
|
version: 9.15.0
|
||||||
standalone: true
|
standalone: true
|
||||||
|
|
||||||
- name: 'Test: which'
|
- name: 'Test: pnpm works'
|
||||||
run: which pnpm
|
|
||||||
|
|
||||||
- name: 'Test: version'
|
|
||||||
run: |
|
run: |
|
||||||
|
set -e
|
||||||
|
which pnpm
|
||||||
actual="$(pnpm --version)"
|
actual="$(pnpm --version)"
|
||||||
echo "pnpm version: ${actual}"
|
if [ "${actual}" != "9.15.0" ]; then
|
||||||
if [[ ! "${actual}" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-.+)?$ ]]; then
|
echo "Expected 9.15.0, got ${actual}"
|
||||||
echo "ERROR: pnpm --version did not produce valid output"
|
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
shell: bash
|
|
||||||
|
|
||||||
- name: 'Test: install in a fresh project'
|
|
||||||
run: |
|
|
||||||
mkdir /tmp/test-standalone
|
mkdir /tmp/test-standalone
|
||||||
cd /tmp/test-standalone
|
cd /tmp/test-standalone
|
||||||
pnpm init
|
pnpm init
|
||||||
pnpm add is-odd
|
pnpm add is-odd
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
||||||
test_version_respects_request:
|
run_install:
|
||||||
name: 'Test version input is actually installed (${{ matrix.version }}, ${{ matrix.os }})'
|
name: 'run_install (${{ matrix.run_install.name }})'
|
||||||
# Regression test for #225 / #230: the bootstrap pnpm on PATH was shadowing the self-updated binary,
|
|
||||||
# so a user requesting e.g. `version: 9.15.5` would silently get the bootstrap version.
|
|
||||||
|
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
os:
|
|
||||||
- ubuntu-latest
|
|
||||||
- macos-latest
|
|
||||||
- windows-latest
|
|
||||||
version:
|
|
||||||
- '9.15.5'
|
|
||||||
- '10.33.0'
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
|
|
||||||
|
|
||||||
- name: Run the action
|
|
||||||
uses: ./
|
|
||||||
with:
|
|
||||||
version: ${{ matrix.version }}
|
|
||||||
|
|
||||||
- name: 'Test: exact version installed'
|
|
||||||
run: |
|
|
||||||
required='${{ matrix.version }}'
|
|
||||||
actual="$(pnpm --version)"
|
|
||||||
echo "pnpm version: ${actual}"
|
|
||||||
if [ "${actual}" != "${required}" ]; then
|
|
||||||
echo "Expected pnpm version ${required}, but got ${actual}"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
shell: bash
|
|
||||||
|
|
||||||
test_package_manager_field:
|
|
||||||
name: 'Test packageManager field is respected (${{ matrix.version }}, ${{ matrix.os }})'
|
|
||||||
# Reproduces #227: when `packageManager` is set in package.json and no `version:` input is given,
|
|
||||||
# the action should install the version specified there.
|
|
||||||
|
|
||||||
runs-on: ${{ matrix.os }}
|
|
||||||
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
os:
|
|
||||||
- ubuntu-latest
|
|
||||||
- macos-latest
|
|
||||||
- windows-latest
|
|
||||||
version:
|
|
||||||
- '9.15.5'
|
|
||||||
- '10.33.0'
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
|
|
||||||
|
|
||||||
- name: Set up package.json with packageManager field
|
|
||||||
run: echo '{"packageManager":"pnpm@${{ matrix.version }}"}' > package.json
|
|
||||||
shell: bash
|
|
||||||
|
|
||||||
- name: Run the action
|
|
||||||
uses: ./
|
|
||||||
|
|
||||||
- name: 'Test: exact version installed'
|
|
||||||
run: |
|
|
||||||
required='${{ matrix.version }}'
|
|
||||||
actual="$(pnpm --version)"
|
|
||||||
echo "pnpm version: ${actual}"
|
|
||||||
if [ "${actual}" != "${required}" ]; then
|
|
||||||
echo "Expected pnpm version ${required}, but got ${actual}"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
shell: bash
|
|
||||||
|
|
||||||
test_dev_engines:
|
|
||||||
name: Test with devEngines.packageManager
|
|
||||||
|
|
||||||
runs-on: ${{ matrix.os }}
|
|
||||||
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
os:
|
|
||||||
- ubuntu-latest
|
|
||||||
- macos-latest
|
|
||||||
- windows-latest
|
|
||||||
version:
|
|
||||||
- '9.15.5'
|
|
||||||
- '>=9.15.0'
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
|
|
||||||
|
|
||||||
- name: Set up package.json with devEngines.packageManager
|
|
||||||
run: echo '{"devEngines":{"packageManager":{"name":"pnpm","version":"${{ matrix.version }}","onFail":"download"}}}' > package.json
|
|
||||||
shell: bash
|
|
||||||
|
|
||||||
- name: Run the action
|
|
||||||
uses: ./
|
|
||||||
|
|
||||||
- name: 'Test: which'
|
|
||||||
run: which pnpm; which pnpx
|
|
||||||
|
|
||||||
- name: 'Test: version'
|
|
||||||
run: |
|
|
||||||
set -e
|
|
||||||
required='${{ matrix.version }}'
|
|
||||||
actual="$(pnpm --version)"
|
|
||||||
echo "pnpm version: ${actual}"
|
|
||||||
|
|
||||||
if [ "${required}" = ">=9.15.0" ]; then
|
|
||||||
min="9.15.0"
|
|
||||||
if [ "$(printf '%s\n' "${min}" "${actual}" | sort -V | head -n1)" != "${min}" ]; then
|
|
||||||
echo "Expected pnpm version >= ${min}, but got ${actual}"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if [ "${actual}" != "${required}" ]; then
|
|
||||||
echo "Expected pnpm version ${required}, but got ${actual}"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
shell: bash
|
|
||||||
|
|
||||||
test_run_install:
|
|
||||||
name: 'Test with run_install (${{ matrix.run_install.name }}, ${{ matrix.os }})'
|
|
||||||
|
|
||||||
runs-on: ${{ matrix.os }}
|
|
||||||
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
pnpm:
|
|
||||||
- 9.15.5
|
|
||||||
os:
|
|
||||||
- ubuntu-latest
|
|
||||||
- macos-latest
|
|
||||||
- windows-latest
|
|
||||||
run_install:
|
run_install:
|
||||||
- name: 'null'
|
- name: 'null'
|
||||||
value: 'null'
|
value: 'null'
|
||||||
@@ -289,15 +222,14 @@ jobs:
|
|||||||
version: 9.15.5
|
version: 9.15.5
|
||||||
run_install: ${{ matrix.run_install.value }}
|
run_install: ${{ matrix.run_install.value }}
|
||||||
|
|
||||||
- name: 'Test: which'
|
- name: 'Test: pnpm works'
|
||||||
run: which pnpm; which pnpx
|
|
||||||
|
|
||||||
- name: 'Test: version'
|
|
||||||
run: |
|
run: |
|
||||||
|
set -e
|
||||||
|
which pnpm
|
||||||
|
which pnpx
|
||||||
actual="$(pnpm --version)"
|
actual="$(pnpm --version)"
|
||||||
echo "pnpm version: ${actual}"
|
if [ "${actual}" != "9.15.5" ]; then
|
||||||
if [[ ! "${actual}" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-.+)?$ ]]; then
|
echo "Expected 9.15.5, got ${actual}"
|
||||||
echo "ERROR: pnpm --version did not produce valid output"
|
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|||||||
299
dist/index.js
vendored
299
dist/index.js
vendored
File diff suppressed because one or more lines are too long
@@ -20,9 +20,10 @@ async function main() {
|
|||||||
async function runMain(inputs: Inputs) {
|
async function runMain(inputs: Inputs) {
|
||||||
saveState('is_post', 'true')
|
saveState('is_post', 'true')
|
||||||
|
|
||||||
await installPnpm(inputs)
|
const binDest = await installPnpm(inputs)
|
||||||
|
if (binDest === undefined) return
|
||||||
console.log('Installation Completed!')
|
console.log('Installation Completed!')
|
||||||
setOutputs(inputs)
|
setOutputs(inputs, binDest)
|
||||||
|
|
||||||
await restoreCache(inputs)
|
await restoreCache(inputs)
|
||||||
|
|
||||||
|
|||||||
@@ -4,13 +4,15 @@ import runSelfInstaller from './run'
|
|||||||
|
|
||||||
export { runSelfInstaller }
|
export { runSelfInstaller }
|
||||||
|
|
||||||
export async function install(inputs: Inputs) {
|
export async function install(inputs: Inputs): Promise<string | undefined> {
|
||||||
startGroup('Running self-installer...')
|
startGroup('Running self-installer...')
|
||||||
const status = await runSelfInstaller(inputs)
|
const { exitCode, binDest } = await runSelfInstaller(inputs)
|
||||||
endGroup()
|
endGroup()
|
||||||
if (status) {
|
if (exitCode) {
|
||||||
return setFailed(`Something went wrong, self-installer exits with code ${status}`)
|
setFailed(`Something went wrong, self-installer exits with code ${exitCode}`)
|
||||||
|
return undefined
|
||||||
}
|
}
|
||||||
|
return binDest
|
||||||
}
|
}
|
||||||
|
|
||||||
export default install
|
export default install
|
||||||
|
|||||||
@@ -12,7 +12,12 @@ import exeLock from './bootstrap/exe-lock.json'
|
|||||||
const BOOTSTRAP_PNPM_PACKAGE_JSON = JSON.stringify({ private: true, dependencies: { pnpm: pnpmLock.packages['node_modules/pnpm'].version } })
|
const BOOTSTRAP_PNPM_PACKAGE_JSON = JSON.stringify({ private: true, dependencies: { pnpm: pnpmLock.packages['node_modules/pnpm'].version } })
|
||||||
const BOOTSTRAP_EXE_PACKAGE_JSON = JSON.stringify({ private: true, dependencies: { '@pnpm/exe': exeLock.packages['node_modules/@pnpm/exe'].version } })
|
const BOOTSTRAP_EXE_PACKAGE_JSON = JSON.stringify({ private: true, dependencies: { '@pnpm/exe': exeLock.packages['node_modules/@pnpm/exe'].version } })
|
||||||
|
|
||||||
export async function runSelfInstaller(inputs: Inputs): Promise<number> {
|
export interface SelfInstallerResult {
|
||||||
|
exitCode: number
|
||||||
|
binDest: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function runSelfInstaller(inputs: Inputs): Promise<SelfInstallerResult> {
|
||||||
const { version, dest, packageJsonFile } = inputs
|
const { version, dest, packageJsonFile } = inputs
|
||||||
|
|
||||||
// pnpm v11 requires Node >= 22.13; use standalone (exe) bootstrap which
|
// pnpm v11 requires Node >= 22.13; use standalone (exe) bootstrap which
|
||||||
@@ -45,7 +50,7 @@ export async function runSelfInstaller(inputs: Inputs): Promise<number> {
|
|||||||
const npmEnv = { ...process.env, [pathKey]: currentPath ? currentPath + path.delimiter + nodeDir : nodeDir }
|
const npmEnv = { ...process.env, [pathKey]: currentPath ? currentPath + path.delimiter + nodeDir : nodeDir }
|
||||||
const npmExitCode = await runCommand('npm', ['ci'], { cwd: dest, env: npmEnv })
|
const npmExitCode = await runCommand('npm', ['ci'], { cwd: dest, env: npmEnv })
|
||||||
if (npmExitCode !== 0) {
|
if (npmExitCode !== 0) {
|
||||||
return npmExitCode
|
return { exitCode: npmExitCode, binDest: path.join(dest, 'node_modules', '.bin') }
|
||||||
}
|
}
|
||||||
|
|
||||||
// On Windows with standalone mode, npm's .bin shims can't properly
|
// On Windows with standalone mode, npm's .bin shims can't properly
|
||||||
@@ -87,11 +92,23 @@ export async function runSelfInstaller(inputs: Inputs): Promise<number> {
|
|||||||
const args = standalone ? ['self-update', targetVersion] : [bootstrapPnpm, 'self-update', targetVersion]
|
const args = standalone ? ['self-update', targetVersion] : [bootstrapPnpm, 'self-update', targetVersion]
|
||||||
const exitCode = await runCommand(cmd, args, { cwd: dest })
|
const exitCode = await runCommand(cmd, args, { cwd: dest })
|
||||||
if (exitCode !== 0) {
|
if (exitCode !== 0) {
|
||||||
return exitCode
|
return { exitCode, binDest: pnpmHome }
|
||||||
}
|
}
|
||||||
|
// self-update writes the target pnpm/pnpx into PNPM_HOME/bin, leaving
|
||||||
|
// the bootstrap symlinks in pnpmHome pointing at the old version. Use
|
||||||
|
// PNPM_HOME/bin so consumers of the bin_dest output (e.g.
|
||||||
|
// `${steps.pnpm.outputs.bin_dest}/pnpm`) invoke the requested version.
|
||||||
|
return { exitCode: 0, binDest: path.join(pnpmHome, 'bin') }
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0
|
// No explicit target version: rely on the bootstrap pnpm to switch to
|
||||||
|
// the version declared in packageManager/devEngines at runtime. Force
|
||||||
|
// `pmOnFail=download` so a project that pins
|
||||||
|
// `devEngines.packageManager.onFail = "error"` doesn't trip BAD_PM_VERSION
|
||||||
|
// before the switch can happen (issue #252). Scoped to this branch so users
|
||||||
|
// who pass an explicit `version:` input keep strict onFail behavior.
|
||||||
|
exportVariable('pnpm_config_pm_on_fail', 'download')
|
||||||
|
return { exitCode: 0, binDest: pnpmHome }
|
||||||
}
|
}
|
||||||
|
|
||||||
function readTargetVersion(opts: {
|
function readTargetVersion(opts: {
|
||||||
|
|||||||
@@ -1,9 +1,7 @@
|
|||||||
import { setOutput } from '@actions/core'
|
import { setOutput } from '@actions/core'
|
||||||
import { Inputs } from '../inputs'
|
import { Inputs } from '../inputs'
|
||||||
import { getBinDest } from '../utils'
|
|
||||||
|
|
||||||
export function setOutputs(inputs: Inputs) {
|
export function setOutputs(inputs: Inputs, binDest: string) {
|
||||||
const binDest = getBinDest(inputs)
|
|
||||||
// NOTE: addPath is already called in installPnpm — do not call it again
|
// NOTE: addPath is already called in installPnpm — do not call it again
|
||||||
// here, as a second addPath would shadow the correct entry on Windows.
|
// here, as a second addPath would shadow the correct entry on Windows.
|
||||||
setOutput('dest', inputs.dest)
|
setOutput('dest', inputs.dest)
|
||||||
|
|||||||
Reference in New Issue
Block a user