Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
autogitmerge
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
autogitmerge
Commits
b254f8bd
Commit
b254f8bd
authored
Nov 30, 2023
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use a timeout for commands involving network
parent
62151c15
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
autogitmerge.mjs
autogitmerge.mjs
+4
-4
No files found.
autogitmerge.mjs
View file @
b254f8bd
...
...
@@ -27,9 +27,9 @@ if (!fs.existsSync(wd)) {
cd
(
wd
)
let
reportedConflictHashes
while
(
true
)
{
await
retry
(
30
,
expBackoff
(),
()
=>
$
`git remote prune project`
)
await
retry
(
30
,
expBackoff
(),
()
=>
$
`git remote prune upstream`
)
await
retry
(
30
,
expBackoff
(),
()
=>
$
`git fetch --all`
)
await
retry
(
30
,
expBackoff
(),
()
=>
$
`git remote prune project`
.
timeout
(
'
600s
'
)
)
await
retry
(
30
,
expBackoff
(),
()
=>
$
`git remote prune upstream`
.
timeout
(
'
600s
'
)
)
await
retry
(
30
,
expBackoff
(),
()
=>
$
`git fetch --all`
.
timeout
(
'
600s
'
)
)
await
$
`git reset --hard project/
${
config
.
project
.
branch
}
`
let
mergeSuccess
=
true
;
...
...
@@ -79,7 +79,7 @@ ${gitOutput}
}
}
if
(
mergeSuccess
)
{
await
retry
(
30
,
expBackoff
(),
()
=>
$
`git push project
${
config
.
project
.
branch
}
`
)
await
retry
(
30
,
expBackoff
(),
()
=>
$
`git push project
${
config
.
project
.
branch
}
`
.
timeout
(
'
600s
'
)
)
}
await
sleep
(
interval
)
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment