Skip to content
Snippets Groups Projects
Commit 467c33a5 authored by Rhys Arkins's avatar Rhys Arkins
Browse files

Rename nextVersion to newVersion

parent 84d69a4c
Branches
No related tags found
No related merge requests found
...@@ -3,19 +3,19 @@ module.exports = { ...@@ -3,19 +3,19 @@ module.exports = {
baseBranch: 'master', baseBranch: 'master',
templates: { templates: {
branchName: (params) => { branchName: (params) => {
return `renovate/${params.depName}-${params.nextVersionMajor}.x`; return `renovate/${params.depName}-${params.newVersionMajor}.x`;
}, },
commitMessage: (params) => { commitMessage: (params) => {
return `Upgrade dependency ${params.depName} to version ${params.nextVersion}`; return `Upgrade dependency ${params.depName} to version ${params.newVersion}`;
}, },
prBody: (params) => { prBody: (params) => {
return `This Pull Request updates dependency ${params.depName} from version ${params.currentVersion} to ${params.nextVersion}.`; return `This Pull Request updates dependency ${params.depName} from version ${params.currentVersion} to ${params.newVersion}.`;
}, },
prTitleMajor: (params) => { prTitleMajor: (params) => {
return `Upgrade dependency ${params.depName} to version ${params.nextVersionMajor}.x`; return `Upgrade dependency ${params.depName} to version ${params.newVersionMajor}.x`;
}, },
prTitleMinor: (params) => { prTitleMinor: (params) => {
return `Upgrade dependency ${params.depName} to version ${params.nextVersion}`; return `Upgrade dependency ${params.depName} to version ${params.newVersion}`;
}, },
} }
}; };
...@@ -65,22 +65,22 @@ function processUpgradesSequentially(upgrades) { ...@@ -65,22 +65,22 @@ function processUpgradesSequentially(upgrades) {
// 2. Edge case collision of branch name, e.g. dependency also listed as dev dependency // 2. Edge case collision of branch name, e.g. dependency also listed as dev dependency
return upgrades.reduce((promise, upgrade) => { return upgrades.reduce((promise, upgrade) => {
return promise.then(() => { return promise.then(() => {
return updateDependency(upgrade.depType, upgrade.depName, upgrade.currentVersion, upgrade.nextVersion); return updateDependency(upgrade.depType, upgrade.depName, upgrade.currentVersion, upgrade.newVersion);
}); });
}, Promise.resolve()); }, Promise.resolve());
} }
function updateDependency(depType, depName, currentVersion, nextVersion) { function updateDependency(depType, depName, currentVersion, newVersion) {
const nextVersionMajor = semver.major(nextVersion); const newVersionMajor = semver.major(newVersion);
const branchName = config.templates.branchName({depType, depName, currentVersion, nextVersion, nextVersionMajor}); const branchName = config.templates.branchName({depType, depName, currentVersion, newVersion, newVersionMajor});
let prTitle = ''; let prTitle = '';
if (nextVersionMajor > semver.major(currentVersion)) { if (newVersionMajor > semver.major(currentVersion)) {
prTitle = config.templates.prTitleMajor({ depType, depName, currentVersion, nextVersion, nextVersionMajor }); prTitle = config.templates.prTitleMajor({ depType, depName, currentVersion, newVersion, newVersionMajor });
} else { } else {
prTitle = config.templates.prTitleMinor({ depType, depName, currentVersion, nextVersion, nextVersionMajor }); prTitle = config.templates.prTitleMinor({ depType, depName, currentVersion, newVersion, newVersionMajor });
} }
const prBody = config.templates.prBody({ depName, currentVersion, nextVersion }); const prBody = config.templates.prBody({ depName, currentVersion, newVersion });
const commitMessage = config.templates.commitMessage({ depName, currentVersion, nextVersion }); const commitMessage = config.templates.commitMessage({ depName, currentVersion, newVersion });
// Check if same PR already existed and skip if so // Check if same PR already existed and skip if so
// This allows users to close an unwanted upgrade PR and not worry about seeing it raised again // This allows users to close an unwanted upgrade PR and not worry about seeing it raised again
...@@ -118,12 +118,12 @@ function updateDependency(depType, depName, currentVersion, nextVersion) { ...@@ -118,12 +118,12 @@ function updateDependency(depType, depName, currentVersion, nextVersion) {
const currentSHA = res.body.sha; const currentSHA = res.body.sha;
const currentFileContent = new Buffer(res.body.content, 'base64').toString(); const currentFileContent = new Buffer(res.body.content, 'base64').toString();
const currentFileContentJson = JSON.parse(currentFileContent); const currentFileContentJson = JSON.parse(currentFileContent);
if (currentFileContentJson[depType][depName] !== nextVersion) { if (currentFileContentJson[depType][depName] !== newVersion) {
// Branch is new, or needs version updated // Branch is new, or needs version updated
if (config.verbose) { if (config.verbose) {
console.log(`${depName}: Updating to ${nextVersion} in branch ${branchName}`); console.log(`${depName}: Updating to ${newVersion} in branch ${branchName}`);
} }
const newPackageContents = packageJson.setNewValue(currentFileContent, depType, depName, nextVersion); const newPackageContents = packageJson.setNewValue(currentFileContent, depType, depName, newVersion);
return github.writeFile(branchName, currentSHA, packageFile, newPackageContents, commitMessage); return github.writeFile(branchName, currentSHA, packageFile, newPackageContents, commitMessage);
} else { } else {
if (config.verbose) { if (config.verbose) {
......
...@@ -49,7 +49,7 @@ module.exports = { ...@@ -49,7 +49,7 @@ module.exports = {
depType: depType, depType: depType,
depName: depName, depName: depName,
currentVersion: currentVersion, currentVersion: currentVersion,
nextVersion: res[majorVersion], newVersion: res[majorVersion],
}); });
}); });
} else { } else {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment