actions/setup-node
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use userconfig and append trailing slash

Browse Source
This commit is contained in:
Danny McCormick 2019-08-06 14:08:18 -04:00
parent b9164e8546
commit 4d381b188a
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/authutil.js
View File

@ -13,11 +13,10 @@ const path = __importStar(require("path"));
const core = __importStar(require("@actions/core")); const core = __importStar(require("@actions/core"));
const github = __importStar(require("@actions/github")); const github = __importStar(require("@actions/github"));
function configAuthentication(registryUrl) { function configAuthentication(registryUrl) {
// const npmrc: string = path.resolve( const npmrc = path.resolve(process.env['RUNNER_TEMP'] || process.cwd(), '.npmrc');
// process.env['RUNNER_TEMP'] || process.cwd(), if (!registryUrl.endsWith('/')) {
// '.npmrc' registryUrl += '/';
// ); }
const npmrc = path.resolve(process.cwd(), '.npmrc');
writeRegistryToFile(registryUrl, npmrc); writeRegistryToFile(registryUrl, npmrc);
} }
exports.configAuthentication = configAuthentication; exports.configAuthentication = configAuthentication;
@ -47,7 +46,7 @@ function writeRegistryToFile(registryUrl, fileLocation) {
: `registry=${registryUrl}`; : `registry=${registryUrl}`;
newContents += `${authString}${os.EOL}${registryString}`; newContents += `${authString}${os.EOL}${registryString}`;
fs.writeFileSync(fileLocation, newContents); fs.writeFileSync(fileLocation, newContents);
// core.exportVariable('NPM_CONFIG_USERCONFIG', fileLocation); core.exportVariable('NPM_CONFIG_USERCONFIG', fileLocation);
// Export empty node_auth_token so npm doesn't complain about not being able to find it // Export empty node_auth_token so npm doesn't complain about not being able to find it
// core.exportVariable('NODE_AUTH_TOKEN', 'XXXXX-XXXXX-XXXXX-XXXXX'); core.exportVariable('NODE_AUTH_TOKEN', 'XXXXX-XXXXX-XXXXX-XXXXX');
} }

16
src/authutil.ts
View File

@ -5,11 +5,13 @@ import * as core from '@actions/core';
import * as github from '@actions/github'; import * as github from '@actions/github';
export function configAuthentication(registryUrl: string) { export function configAuthentication(registryUrl: string) {
// const npmrc: string = path.resolve( const npmrc: string = path.resolve(
// process.env['RUNNER_TEMP'] || process.cwd(), process.env['RUNNER_TEMP'] || process.cwd(),
// '.npmrc' '.npmrc'
// ); );
const npmrc: string = path.resolve(process.cwd(), '.npmrc'); if (!registryUrl.endsWith('/')) {
registryUrl += '/';
}
writeRegistryToFile(registryUrl, npmrc); writeRegistryToFile(registryUrl, npmrc);
} }
@ -42,7 +44,7 @@ function writeRegistryToFile(registryUrl: string, fileLocation: string) {
: `registry=${registryUrl}`; : `registry=${registryUrl}`;
newContents += `${authString}${os.EOL}${registryString}`; newContents += `${authString}${os.EOL}${registryString}`;
fs.writeFileSync(fileLocation, newContents); fs.writeFileSync(fileLocation, newContents);
// core.exportVariable('NPM_CONFIG_USERCONFIG', fileLocation); core.exportVariable('NPM_CONFIG_USERCONFIG', fileLocation);
// Export empty node_auth_token so npm doesn't complain about not being able to find it // Export empty node_auth_token so npm doesn't complain about not being able to find it
// core.exportVariable('NODE_AUTH_TOKEN', 'XXXXX-XXXXX-XXXXX-XXXXX'); core.exportVariable('NODE_AUTH_TOKEN', 'XXXXX-XXXXX-XXXXX-XXXXX');
} }