renovate/renovate
1
0
Fork 0
mirror of https://github.com/renovatebot/renovate.git synced 2025-01-11 22:46:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

fix: support quotation marks for circleci

Browse source 
Fixes #1745
This commit is contained in:
Rhys Arkins 2018-03-29 19:25:31 +02:00
parent 9a28852eb9
commit ba614d4624
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/manager/circleci/extract.js
View file

@ -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 {

2
lib/manager/circleci/update.js
View file

@ -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;

4
test/_fixtures/circleci/config.yml
View file

@ -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:
node-v8: node-v8:
<<: *node-base <<: *node-base
docker: docker:
- image: node:8.9.0 - image: "node:8.9.0"