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
2de519ca
Unverified
Commit
2de519ca
authored
4 years ago
by
Jamie Magee
Committed by
GitHub
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
feat(git-submodules): use checkout instead of submodule update (#7645)
parent
34d3e21e
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/manager/git-submodules/update.spec.ts
+13
-5
13 additions, 5 deletions
lib/manager/git-submodules/update.spec.ts
lib/manager/git-submodules/update.ts
+4
-7
4 additions, 7 deletions
lib/manager/git-submodules/update.ts
with
17 additions
and
12 deletions
lib/manager/git-submodules/update.spec.ts
+
13
−
5
View file @
2de519ca
import
_simpleGit
from
'
simple-git
'
;
import
{
dir
}
from
'
tmp-promise
'
;
import
{
Upgrade
}
from
'
../common
'
;
import
updateDependency
from
'
./update
'
;
...
...
@@ -8,28 +9,35 @@ const simpleGit: any = _simpleGit;
describe
(
'
manager/git-submodules/update
'
,
()
=>
{
describe
(
'
updateDependency
'
,
()
=>
{
let
upgrade
:
Upgrade
;
beforeAll
(
async
()
=>
{
const
tmpDir
=
await
dir
();
upgrade
=
{
localDir
:
tmpDir
.
path
,
depName
:
'
renovate
'
};
});
it
(
'
returns null on error
'
,
async
()
=>
{
simpleGit
.
mockReturnValue
({
raw
()
{
submoduleUpdate
()
{
throw
new
Error
();
},
});
const
update
=
await
updateDependency
({
fileContent
:
''
,
upgrade
:
{}
,
upgrade
,
});
expect
(
update
).
toBeNull
();
});
it
(
'
returns content on update
'
,
async
()
=>
{
const
tmpDir
=
await
dir
();
simpleGit
.
mockReturnValue
({
raw
()
{
submoduleUpdate
()
{
return
Promise
.
resolve
();
},
checkout
()
{
return
Promise
.
resolve
();
},
});
const
update
=
await
updateDependency
({
fileContent
:
''
,
upgrade
:
{
localDir
:
tmpDir
.
path
}
,
upgrade
,
});
expect
(
update
).
toEqual
(
''
);
});
...
...
This diff is collapsed.
Click to expand it.
lib/manager/git-submodules/update.ts
+
4
−
7
View file @
2de519ca
import
Git
from
'
simple-git
'
;
import
upath
from
'
upath
'
;
import
{
UpdateDependencyConfig
}
from
'
../common
'
;
...
...
@@ -7,15 +8,11 @@ export default async function updateDependency({
upgrade
,
}:
UpdateDependencyConfig
):
Promise
<
string
|
null
>
{
const
git
=
Git
(
upgrade
.
localDir
);
const
submoduleGit
=
Git
(
upath
.
join
(
upgrade
.
localDir
,
upgrade
.
depName
));
try
{
await
git
.
raw
([
'
submodule
'
,
'
update
'
,
'
--init
'
,
'
--remote
'
,
upgrade
.
depName
,
]);
await
git
.
submoduleUpdate
([
'
--init
'
,
upgrade
.
depName
]);
await
submoduleGit
.
checkout
([
upgrade
.
newVersion
]);
return
fileContent
;
}
catch
(
err
)
{
return
null
;
...
...
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