diff --git a/lib/modules/manager/github-actions/__fixtures__/workflow_1.yml b/lib/modules/manager/github-actions/__fixtures__/workflow_1.yml index 42fb8da0961915152362dc561d3dfb11aee99797..c13746e89f0511ba3eb394faeda4faf677f4ff36 100644 --- a/lib/modules/manager/github-actions/__fixtures__/workflow_1.yml +++ b/lib/modules/manager/github-actions/__fixtures__/workflow_1.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Shell lint - uses: actions/bin/shellcheck@master + uses : actions/bin/shellcheck@master run: ./entrypoint.sh docker_lint: name: Docker lint diff --git a/lib/modules/manager/github-actions/extract.ts b/lib/modules/manager/github-actions/extract.ts index 9b6ccf4a726ac12ab58cfac6f1596225b899d77d..14ba5c4b99b5e1d1e94a26159f6d45a5279271c3 100644 --- a/lib/modules/manager/github-actions/extract.ts +++ b/lib/modules/manager/github-actions/extract.ts @@ -13,9 +13,9 @@ import { getDep } from '../dockerfile/extract'; import type { PackageDependency, PackageFileContent } from '../types'; import type { Workflow } from './types'; -const dockerActionRe = regEx(/^\s+uses: ['"]?docker:\/\/([^'"]+)\s*$/); +const dockerActionRe = regEx(/^\s+uses\s*: ['"]?docker:\/\/([^'"]+)\s*$/); const actionRe = regEx( - /^\s+-?\s+?uses: (?<replaceString>['"]?(?<registryUrl>https:\/\/[.\w-]+\/)?(?<depName>[\w-]+\/[.\w-]+)(?<path>\/.*)?@(?<currentValue>[^\s'"]+)['"]?(?:\s+#\s*(?:renovate\s*:\s*)?(?:pin\s+|tag\s*=\s*)?@?(?<tag>v?\d+(?:\.\d+(?:\.\d+)?)?))?)/, + /^\s+-?\s+?uses\s*: (?<replaceString>['"]?(?<registryUrl>https:\/\/[.\w-]+\/)?(?<depName>[\w-]+\/[.\w-]+)(?<path>\/.*)?@(?<currentValue>[^\s'"]+)['"]?(?:\s+#\s*(?:renovate\s*:\s*)?(?:pin\s+|tag\s*=\s*)?@?(?<tag>v?\d+(?:\.\d+(?:\.\d+)?)?))?)/, ); // SHA1 or SHA256, see https://github.blog/2020-10-19-git-2-29-released/