Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
renovate
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GitHub Mirror
Renovate Bot
renovate
Commits
69705c99
Unverified
Commit
69705c99
authored
3 years ago
by
Rhys Arkins
Committed by
GitHub
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
feat(automerge): recurse after automerge (#10229)
parent
13863d7c
No related branches found
Branches containing commit
Tags
commento-0.1.28
gitea-0.6.1
nextcloud-0.11.9
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
lib/workers/repository/index.ts
+10
-2
10 additions, 2 deletions
lib/workers/repository/index.ts
with
10 additions
and
2 deletions
lib/workers/repository/index.ts
+
10
−
2
View file @
69705c99
...
@@ -25,7 +25,8 @@ try {
...
@@ -25,7 +25,8 @@ try {
// istanbul ignore next
// istanbul ignore next
export
async
function
renovateRepository
(
export
async
function
renovateRepository
(
repoConfig
:
RenovateConfig
repoConfig
:
RenovateConfig
,
canRetry
=
true
):
Promise
<
ProcessResult
>
{
):
Promise
<
ProcessResult
>
{
splitInit
();
splitInit
();
let
config
=
setAdminConfig
(
repoConfig
);
let
config
=
setAdminConfig
(
repoConfig
);
...
@@ -47,7 +48,14 @@ export async function renovateRepository(
...
@@ -47,7 +48,14 @@ export async function renovateRepository(
const
res
=
await
updateRepo
(
config
,
branches
);
const
res
=
await
updateRepo
(
config
,
branches
);
addSplit
(
'
update
'
);
addSplit
(
'
update
'
);
await
setBranchCache
(
branches
);
await
setBranchCache
(
branches
);
if
(
res
!==
'
automerged
'
)
{
if
(
res
===
'
automerged
'
)
{
if
(
canRetry
)
{
logger
.
info
(
'
Renovating repository again after automerge result
'
);
const
recursiveRes
=
await
renovateRepository
(
repoConfig
,
false
);
return
recursiveRes
;
}
logger
.
debug
(
`Automerged but already retried once`
);
}
else
{
await
ensureMasterIssue
(
config
,
branches
);
await
ensureMasterIssue
(
config
,
branches
);
}
}
await
finaliseRepo
(
config
,
branchList
);
await
finaliseRepo
(
config
,
branchList
);
...
...
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