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
27db9cfb
Commit
27db9cfb
authored
7 years ago
by
Rhys Arkins
Browse files
Options
Downloads
Patches
Plain Diff
refactor: remove automerge recursion
parent
b6cf7360
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/workers/repository/error.js
+0
-4
0 additions, 4 deletions
lib/workers/repository/error.js
lib/workers/repository/index.js
+2
-12
2 additions, 12 deletions
lib/workers/repository/index.js
with
2 additions
and
16 deletions
lib/workers/repository/error.js
+
0
−
4
View file @
27db9cfb
...
...
@@ -38,10 +38,6 @@ async function handleError(config, err) {
}
else
if
(
err
.
message
===
'
no-package-files
'
)
{
logger
.
info
(
'
Repository has no package files - skipping
'
);
return
err
.
message
;
}
else
if
(
err
.
message
===
'
loops>10
'
)
{
logger
.
warn
(
'
Repository has looped 10 times already
'
);
delete
config
.
branchList
;
// eslint-disable-line no-param-reassign
return
err
.
message
;
}
else
if
(
err
.
message
===
'
repository-changed
'
)
{
logger
.
info
(
'
Repository has changed during renovation - aborting
'
);
delete
config
.
branchList
;
// eslint-disable-line no-param-reassign
...
...
This diff is collapsed.
Click to expand it.
lib/workers/repository/index.js
+
2
−
12
View file @
27db9cfb
...
...
@@ -6,7 +6,6 @@ const { writeUpdates } = require('./write');
const
{
handleError
}
=
require
(
'
./error
'
);
const
{
pruneStaleBranches
}
=
require
(
'
./cleanup
'
);
const
{
validatePrs
}
=
require
(
'
./validate
'
);
const
delay
=
require
(
'
delay
'
);
const
{
resolvePackageFiles
}
=
require
(
'
../../manager
'
);
...
...
@@ -14,20 +13,16 @@ module.exports = {
renovateRepository
,
};
async
function
renovateRepository
(
repoConfig
,
token
,
loop
=
1
)
{
async
function
renovateRepository
(
repoConfig
,
token
)
{
let
config
=
{
...
repoConfig
,
branchList
:
[]
};
config
.
global
=
config
.
global
||
{};
logger
.
setMeta
({
repository
:
config
.
repository
});
logger
.
info
(
'
Renovating repository
'
);
logger
.
trace
({
config
,
loop
},
'
renovateRepository()
'
);
logger
.
trace
({
config
},
'
renovateRepository()
'
);
let
commonConfig
;
try
{
if
(
loop
>
10
)
{
throw
new
Error
(
'
loops>10
'
);
}
config
=
await
initApis
(
config
,
token
);
config
=
await
initRepo
(
config
);
if
(
config
.
baseBranches
&&
config
.
baseBranches
.
length
)
{
// At this point we know if we have multiple branches
// Do the following for every branch
...
...
@@ -80,11 +75,6 @@ async function renovateRepository(repoConfig, token, loop = 1) {
const
res
=
config
.
repoIsOnboarded
?
await
writeUpdates
(
config
)
:
await
ensureOnboardingPr
(
config
);
if
(
res
===
'
pr-closed
'
||
res
===
'
automerged
'
)
{
logger
.
info
(
`Restarting repo renovation after
${
res
}
`
);
await
delay
(
5000
);
return
renovateRepository
(
repoConfig
,
token
,
loop
+
1
);
}
await
validatePrs
(
commonConfig
||
config
);
return
res
;
}
catch
(
err
)
{
...
...
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