Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
renovate
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SmartDataLab
public
applications
renovate
Commits
467c33a5
Commit
467c33a5
authored
8 years ago
by
Rhys Arkins
Browse files
Options
Downloads
Patches
Plain Diff
Rename nextVersion to newVersion
parent
84d69a4c
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/config.js
+5
-5
5 additions, 5 deletions
src/config.js
src/index.js
+12
-12
12 additions, 12 deletions
src/index.js
src/npm.js
+1
-1
1 addition, 1 deletion
src/npm.js
with
18 additions
and
18 deletions
src/config.js
+
5
−
5
View file @
467c33a5
...
@@ -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
.
ne
xt
VersionMajor
}
.x`
;
return
`renovate/
${
params
.
depName
}
-
${
params
.
ne
w
VersionMajor
}
.x`
;
},
},
commitMessage
:
(
params
)
=>
{
commitMessage
:
(
params
)
=>
{
return
`Upgrade dependency
${
params
.
depName
}
to version
${
params
.
ne
xt
Version
}
`
;
return
`Upgrade dependency
${
params
.
depName
}
to version
${
params
.
ne
w
Version
}
`
;
},
},
prBody
:
(
params
)
=>
{
prBody
:
(
params
)
=>
{
return
`This Pull Request updates dependency
${
params
.
depName
}
from version
${
params
.
currentVersion
}
to
${
params
.
ne
xt
Version
}
.`
;
return
`This Pull Request updates dependency
${
params
.
depName
}
from version
${
params
.
currentVersion
}
to
${
params
.
ne
w
Version
}
.`
;
},
},
prTitleMajor
:
(
params
)
=>
{
prTitleMajor
:
(
params
)
=>
{
return
`Upgrade dependency
${
params
.
depName
}
to version
${
params
.
ne
xt
VersionMajor
}
.x`
;
return
`Upgrade dependency
${
params
.
depName
}
to version
${
params
.
ne
w
VersionMajor
}
.x`
;
},
},
prTitleMinor
:
(
params
)
=>
{
prTitleMinor
:
(
params
)
=>
{
return
`Upgrade dependency
${
params
.
depName
}
to version
${
params
.
ne
xt
Version
}
`
;
return
`Upgrade dependency
${
params
.
depName
}
to version
${
params
.
ne
w
Version
}
`
;
},
},
}
}
};
};
This diff is collapsed.
Click to expand it.
src/index.js
+
12
−
12
View file @
467c33a5
...
@@ -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
.
ne
xt
Version
);
return
updateDependency
(
upgrade
.
depType
,
upgrade
.
depName
,
upgrade
.
currentVersion
,
upgrade
.
ne
w
Version
);
});
});
},
Promise
.
resolve
());
},
Promise
.
resolve
());
}
}
function
updateDependency
(
depType
,
depName
,
currentVersion
,
ne
xt
Version
)
{
function
updateDependency
(
depType
,
depName
,
currentVersion
,
ne
w
Version
)
{
const
ne
xt
VersionMajor
=
semver
.
major
(
ne
xt
Version
);
const
ne
w
VersionMajor
=
semver
.
major
(
ne
w
Version
);
const
branchName
=
config
.
templates
.
branchName
({
depType
,
depName
,
currentVersion
,
ne
xt
Version
,
ne
xt
VersionMajor
});
const
branchName
=
config
.
templates
.
branchName
({
depType
,
depName
,
currentVersion
,
ne
w
Version
,
ne
w
VersionMajor
});
let
prTitle
=
''
;
let
prTitle
=
''
;
if
(
ne
xt
VersionMajor
>
semver
.
major
(
currentVersion
))
{
if
(
ne
w
VersionMajor
>
semver
.
major
(
currentVersion
))
{
prTitle
=
config
.
templates
.
prTitleMajor
({
depType
,
depName
,
currentVersion
,
ne
xt
Version
,
ne
xt
VersionMajor
});
prTitle
=
config
.
templates
.
prTitleMajor
({
depType
,
depName
,
currentVersion
,
ne
w
Version
,
ne
w
VersionMajor
});
}
else
{
}
else
{
prTitle
=
config
.
templates
.
prTitleMinor
({
depType
,
depName
,
currentVersion
,
ne
xt
Version
,
ne
xt
VersionMajor
});
prTitle
=
config
.
templates
.
prTitleMinor
({
depType
,
depName
,
currentVersion
,
ne
w
Version
,
ne
w
VersionMajor
});
}
}
const
prBody
=
config
.
templates
.
prBody
({
depName
,
currentVersion
,
ne
xt
Version
});
const
prBody
=
config
.
templates
.
prBody
({
depName
,
currentVersion
,
ne
w
Version
});
const
commitMessage
=
config
.
templates
.
commitMessage
({
depName
,
currentVersion
,
ne
xt
Version
});
const
commitMessage
=
config
.
templates
.
commitMessage
({
depName
,
currentVersion
,
ne
w
Version
});
// 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
]
!==
ne
xt
Version
)
{
if
(
currentFileContentJson
[
depType
][
depName
]
!==
ne
w
Version
)
{
// 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
${
ne
xt
Version
}
in branch
${
branchName
}
`
);
console
.
log
(
`
${
depName
}
: Updating to
${
ne
w
Version
}
in branch
${
branchName
}
`
);
}
}
const
newPackageContents
=
packageJson
.
setNewValue
(
currentFileContent
,
depType
,
depName
,
ne
xt
Version
);
const
newPackageContents
=
packageJson
.
setNewValue
(
currentFileContent
,
depType
,
depName
,
ne
w
Version
);
return
github
.
writeFile
(
branchName
,
currentSHA
,
packageFile
,
newPackageContents
,
commitMessage
);
return
github
.
writeFile
(
branchName
,
currentSHA
,
packageFile
,
newPackageContents
,
commitMessage
);
}
else
{
}
else
{
if
(
config
.
verbose
)
{
if
(
config
.
verbose
)
{
...
...
This diff is collapsed.
Click to expand it.
src/npm.js
+
1
−
1
View file @
467c33a5
...
@@ -49,7 +49,7 @@ module.exports = {
...
@@ -49,7 +49,7 @@ module.exports = {
depType
:
depType
,
depType
:
depType
,
depName
:
depName
,
depName
:
depName
,
currentVersion
:
currentVersion
,
currentVersion
:
currentVersion
,
ne
xt
Version
:
res
[
majorVersion
],
ne
w
Version
:
res
[
majorVersion
],
});
});
});
});
}
else
{
}
else
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment