mirror of
				https://github.com/actions/setup-node.git
				synced 2025-11-04 13:29:12 +08:00 
			
		
		
		
	feat: add volta as node-version-file
This commit is contained in:
		
							
								
								
									
										8
									
								
								dist/setup/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								dist/setup/index.js
									
									
									
									
										vendored
									
									
								
							@@ -71862,7 +71862,8 @@ function run() {
 | 
			
		||||
exports.run = run;
 | 
			
		||||
function resolveVersionInput() {
 | 
			
		||||
    let version = core.getInput('node-version');
 | 
			
		||||
    const versionFileInput = core.getInput('node-version-file');
 | 
			
		||||
    const nodeVersionFile = core.getInput('node-version-file');
 | 
			
		||||
    const versionFileInput = nodeVersionFile === 'volta' ? 'package.json' : nodeVersionFile;
 | 
			
		||||
    if (version && versionFileInput) {
 | 
			
		||||
        core.warning('Both node-version and node-version-file inputs are specified, only node-version will be used');
 | 
			
		||||
    }
 | 
			
		||||
@@ -71874,7 +71875,12 @@ function resolveVersionInput() {
 | 
			
		||||
        if (!fs_1.default.existsSync(versionFilePath)) {
 | 
			
		||||
            throw new Error(`The specified node version file at: ${versionFilePath} does not exist`);
 | 
			
		||||
        }
 | 
			
		||||
        if (nodeVersionFile === 'volta') {
 | 
			
		||||
            version = JSON.parse(fs_1.default.readFileSync(versionFilePath, 'utf8')).volta.node;
 | 
			
		||||
        }
 | 
			
		||||
        else {
 | 
			
		||||
            version = installer.parseNodeVersionFile(fs_1.default.readFileSync(versionFilePath, 'utf8'));
 | 
			
		||||
        }
 | 
			
		||||
        core.info(`Resolved ${versionFileInput} as ${version}`);
 | 
			
		||||
    }
 | 
			
		||||
    return version;
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										11
									
								
								src/main.ts
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								src/main.ts
									
									
									
									
									
								
							@@ -65,7 +65,9 @@ export async function run() {
 | 
			
		||||
 | 
			
		||||
function resolveVersionInput(): string {
 | 
			
		||||
  let version = core.getInput('node-version');
 | 
			
		||||
  const versionFileInput = core.getInput('node-version-file');
 | 
			
		||||
  const nodeVersionFile = core.getInput('node-version-file');
 | 
			
		||||
  const versionFileInput =
 | 
			
		||||
    nodeVersionFile === 'volta' ? 'package.json' : nodeVersionFile;
 | 
			
		||||
 | 
			
		||||
  if (version && versionFileInput) {
 | 
			
		||||
    core.warning(
 | 
			
		||||
@@ -82,14 +84,21 @@ function resolveVersionInput(): string {
 | 
			
		||||
      process.env.GITHUB_WORKSPACE!,
 | 
			
		||||
      versionFileInput
 | 
			
		||||
    );
 | 
			
		||||
 | 
			
		||||
    if (!fs.existsSync(versionFilePath)) {
 | 
			
		||||
      throw new Error(
 | 
			
		||||
        `The specified node version file at: ${versionFilePath} does not exist`
 | 
			
		||||
      );
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if (nodeVersionFile === 'volta') {
 | 
			
		||||
      version = JSON.parse(fs.readFileSync(versionFilePath, 'utf8')).volta.node;
 | 
			
		||||
    } else {
 | 
			
		||||
      version = installer.parseNodeVersionFile(
 | 
			
		||||
          fs.readFileSync(versionFilePath, 'utf8')
 | 
			
		||||
      );
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    core.info(`Resolved ${versionFileInput} as ${version}`);
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user