From 6ad6022fb20b8b3d4a501bbd1fdfe9a1ba2c1080 Mon Sep 17 00:00:00 2001 From: Yohann Genre <5088279+Yokann@users.noreply.github.com> Date: Tue, 26 Mar 2024 15:41:47 +0100 Subject: [PATCH] feat(manager/github-actions): extract complex github tags (#27941) --- .../manager/github-actions/__snapshots__/extract.spec.ts.snap | 3 --- lib/modules/manager/github-actions/extract.spec.ts | 3 ++- lib/modules/manager/github-actions/extract.ts | 3 --- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/modules/manager/github-actions/__snapshots__/extract.spec.ts.snap b/lib/modules/manager/github-actions/__snapshots__/extract.spec.ts.snap index c10544c99c6d79..713985a87545cf 100644 --- a/lib/modules/manager/github-actions/__snapshots__/extract.spec.ts.snap +++ b/lib/modules/manager/github-actions/__snapshots__/extract.spec.ts.snap @@ -10,7 +10,6 @@ exports[`modules/manager/github-actions/extract extractPackageFile() extracts mu "depName": "actions/bin", "depType": "action", "replaceString": "actions/bin/shellcheck@master", - "skipReason": "invalid-version", "versioning": "docker", }, { @@ -127,7 +126,6 @@ exports[`modules/manager/github-actions/extract extractPackageFile() extracts mu "depName": "actions/bin", "depType": "action", "replaceString": "actions/bin/shellcheck@master", - "skipReason": "invalid-version", "versioning": "docker", }, { @@ -147,7 +145,6 @@ exports[`modules/manager/github-actions/extract extractPackageFile() extracts mu "depName": "actions/docker", "depType": "action", "replaceString": "actions/docker/cli@master", - "skipReason": "invalid-version", "versioning": "docker", }, { diff --git a/lib/modules/manager/github-actions/extract.spec.ts b/lib/modules/manager/github-actions/extract.spec.ts index f45bc1c5bca660..b0b796bb30009d 100644 --- a/lib/modules/manager/github-actions/extract.spec.ts +++ b/lib/modules/manager/github-actions/extract.spec.ts @@ -371,7 +371,6 @@ describe('modules/manager/github-actions/extract', () => { { currentValue: '01aecc#v2.1.0', replaceString: 'actions/checkout@01aecc#v2.1.0', - skipReason: 'invalid-version', }, { currentDigest: '689fcce700ae7ffc576f2b029b51b2ffb66d3abd', @@ -404,6 +403,8 @@ describe('modules/manager/github-actions/extract', () => { 'actions-runner-controller/execute-assert-arc-e2e@f1d7c52253b89f0beae60141f8465d9495cdc2cf # actions-runner-controller-0.23.5', }, ]); + + expect(res!.deps[14]).not.toHaveProperty('skipReason'); }); it('extracts actions with fqdn', () => { diff --git a/lib/modules/manager/github-actions/extract.ts b/lib/modules/manager/github-actions/extract.ts index ce6f18cd1c2012..c147df401c9180 100644 --- a/lib/modules/manager/github-actions/extract.ts +++ b/lib/modules/manager/github-actions/extract.ts @@ -100,9 +100,6 @@ function extractWithRegex(content: string): PackageDependency[] { dep.currentDigestShort = currentValue; } else { dep.currentValue = currentValue; - if (!dockerVersioning.api.isValid(currentValue)) { - dep.skipReason = 'invalid-version'; - } } deps.push(dep); }