Skip to content
Snippets Groups Projects
Unverified Commit 2cf304b6 authored by Philip's avatar Philip Committed by GitHub
Browse files

fix(manager/github-actions): dependencies with quotes are ignored (#14130)

parent a2bf99d4
No related branches found
No related tags found
No related merge requests found
jobs:
automerge:
runs-on: ubuntu-latest
steps:
- name: Auto merge
uses: "pascalgn/automerge-action@v0.13.1"
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
MERGE_METHOD: squash
......@@ -136,3 +136,18 @@ Array [
},
]
`;
exports[`manager/github-actions/extract extractPackageFile() extracts tag line with double quotes 1`] = `
Array [
Object {
"autoReplaceStringTemplate": "{{depName}}@{{#if newDigest}}{{newDigest}}{{#if newValue}} # tag={{newValue}}{{/if}}{{/if}}{{#unless newDigest}}{{newValue}}{{/unless}}",
"commitMessageTopic": "{{{depName}}} action",
"currentValue": "v0.13.1",
"datasource": "github-tags",
"depName": "pascalgn/automerge-action",
"depType": "action",
"replaceString": "\\"pascalgn/automerge-action@v0.13.1\\"",
"versioning": "docker",
},
]
`;
......@@ -18,5 +18,18 @@ describe('manager/github-actions/extract', () => {
res.deps.filter((d) => d.datasource === 'github-tags')
).toHaveLength(8);
});
it('extracts tag line with double quotes', () => {
const res = extractPackageFile(Fixtures.get('workflow_3.yml'));
expect(res.deps).toMatchSnapshot([
{
currentValue: 'v0.13.1',
datasource: 'github-tags',
depName: 'pascalgn/automerge-action',
depType: 'action',
replaceString: '"pascalgn/automerge-action@v0.13.1"',
versioning: 'docker',
},
]);
});
});
});
......@@ -7,7 +7,7 @@ import type { PackageDependency, PackageFile } from '../types';
const dockerRe = regEx(/^\s+uses: docker:\/\/([^"]+)\s*$/);
const actionRe = regEx(
/^\s+-?\s+?uses: (?<replaceString>(?<depName>[\w-]+\/[\w-]+)(?<path>\/.*)?@(?<currentValue>.+?)\s*(?:#\s+(?:renovate:\s+)?tag=(?<tag>.+?))?)\s*?$/
/^\s+-?\s+?uses: (?<replaceString>['"]?(?<depName>[\w-]+\/[\w-]+)(?<path>\/.*)?@(?<currentValue>.+?)\s*['"]?(?:#\s+(?:renovate:\s+)?tag=(?<tag>.+?))?)\s*?$/
);
// SHA1 or SHA256, see https://github.blog/2020-10-19-git-2-29-released/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment