mirror of
https://github.com/actions/setup-node.git
synced 2025-04-02 01:30:20 +08:00
Merge 325751ad7dc8f907fdb7882cbe84f0cf216f0dca into 40337cb8f758cccdfe3475af609daa63f81c7e23
This commit is contained in:
commit
1b0ec84ac3
2
dist/setup/index.js
vendored
2
dist/setup/index.js
vendored
@ -97802,7 +97802,6 @@ function run() {
|
||||
//
|
||||
const version = resolveVersionInput();
|
||||
let arch = core.getInput('architecture');
|
||||
const cache = core.getInput('cache');
|
||||
// if architecture supplied but node-version is not
|
||||
// if we don't throw a warning, the already installed x64 node will be used which is not probably what user meant.
|
||||
if (arch && !version) {
|
||||
@ -97832,6 +97831,7 @@ function run() {
|
||||
if (registryUrl) {
|
||||
auth.configAuthentication(registryUrl, alwaysAuth);
|
||||
}
|
||||
const cache = core.getInput('cache');
|
||||
if (cache && (0, cache_utils_1.isCacheFeatureAvailable)()) {
|
||||
core.saveState(constants_1.State.CachePackageManager, cache);
|
||||
const cacheDependencyPath = core.getInput('cache-dependency-path');
|
||||
|
@ -19,7 +19,6 @@ export async function run() {
|
||||
const version = resolveVersionInput();
|
||||
|
||||
let arch = core.getInput('architecture');
|
||||
const cache = core.getInput('cache');
|
||||
|
||||
// if architecture supplied but node-version is not
|
||||
// if we don't throw a warning, the already installed x64 node will be used which is not probably what user meant.
|
||||
@ -59,6 +58,7 @@ export async function run() {
|
||||
auth.configAuthentication(registryUrl, alwaysAuth);
|
||||
}
|
||||
|
||||
const cache = core.getInput('cache');
|
||||
if (cache && isCacheFeatureAvailable()) {
|
||||
core.saveState(State.CachePackageManager, cache);
|
||||
const cacheDependencyPath = core.getInput('cache-dependency-path');
|
||||
|
Loading…
x
Reference in New Issue
Block a user