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
ba614d46
Commit
ba614d46
authored
7 years ago
by
Rhys Arkins
Browse files
Options
Downloads
Patches
Plain Diff
fix: support quotation marks for circleci
Fixes #1745
parent
9a28852e
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
lib/manager/circleci/extract.js
+1
-1
1 addition, 1 deletion
lib/manager/circleci/extract.js
lib/manager/circleci/update.js
+1
-1
1 addition, 1 deletion
lib/manager/circleci/update.js
test/_fixtures/circleci/config.yml
+2
-2
2 additions, 2 deletions
test/_fixtures/circleci/config.yml
with
4 additions
and
4 deletions
lib/manager/circleci/extract.js
+
1
−
1
View file @
ba614d46
...
@@ -9,7 +9,7 @@ function extractDependencies(content) {
...
@@ -9,7 +9,7 @@ function extractDependencies(content) {
const
deps
=
[];
const
deps
=
[];
let
lineNumber
=
0
;
let
lineNumber
=
0
;
for
(
const
line
of
content
.
split
(
'
\n
'
))
{
for
(
const
line
of
content
.
split
(
'
\n
'
))
{
const
match
=
line
.
match
(
/^
\s
*- image:
\s
*
([^\s]
+
)\s
*$/
);
const
match
=
line
.
match
(
/^
\s
*- image:
\s
*
'
?
"
?
([^\s
'"
]
+
)
'
?
"
?
\s
*$/
);
if
(
match
)
{
if
(
match
)
{
const
currentFrom
=
match
[
1
];
const
currentFrom
=
match
[
1
];
const
{
const
{
...
...
This diff is collapsed.
Click to expand it.
lib/manager/circleci/update.js
+
1
−
1
View file @
ba614d46
...
@@ -7,7 +7,7 @@ function setNewValue(currentFileContent, upgrade) {
...
@@ -7,7 +7,7 @@ function setNewValue(currentFileContent, upgrade) {
logger
.
debug
(
`circleci.setNewValue:
${
upgrade
.
newFrom
}
`
);
logger
.
debug
(
`circleci.setNewValue:
${
upgrade
.
newFrom
}
`
);
const
lines
=
currentFileContent
.
split
(
'
\n
'
);
const
lines
=
currentFileContent
.
split
(
'
\n
'
);
const
lineToChange
=
lines
[
upgrade
.
lineNumber
];
const
lineToChange
=
lines
[
upgrade
.
lineNumber
];
const
imageLine
=
new
RegExp
(
/^
(\s
*- image:
\s
*
)[^\s]
+
(\s
*
)
$/
);
const
imageLine
=
new
RegExp
(
/^
(\s
*- image:
\s
*
'
?
"
?
)[^\s
'"
]
+
(
'
?
"
?
\s
*
)
$/
);
if
(
!
lineToChange
.
match
(
imageLine
))
{
if
(
!
lineToChange
.
match
(
imageLine
))
{
logger
.
debug
(
'
No image line found
'
);
logger
.
debug
(
'
No image line found
'
);
return
null
;
return
null
;
...
...
This diff is collapsed.
Click to expand it.
test/_fixtures/circleci/config.yml
+
2
−
2
View file @
ba614d46
...
@@ -55,7 +55,7 @@ jobs:
...
@@ -55,7 +55,7 @@ jobs:
node-v4
:
node-v4
:
<<
:
*node-base
<<
:
*node-base
docker
:
docker
:
-
image
:
node:4
-
image
:
'
node:4
'
node-v6
:
node-v6
:
<<
:
*node-base
<<
:
*node-base
docker
:
docker
:
...
@@ -63,4 +63,4 @@ jobs:
...
@@ -63,4 +63,4 @@ jobs:
node-v8
:
node-v8
:
<<
:
*node-base
<<
:
*node-base
docker
:
docker
:
-
image
:
node:8.9.0
-
image
:
"
node:8.9.0
"
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