Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions lib/config/presets/internal/helpers.preset.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,6 @@ export const presets: Record<string, Preset> = {
{
extends: ['helpers:pinGitHubActionDigests'],
extractVersion: '^(?<version>v?\\d+\\.\\d+\\.\\d+)$',
versioning:
'regex:^v?(?<major>\\d+)(\\.(?<minor>\\d+)\\.(?<patch>\\d+))?$',
},
],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ exports[`modules/manager/github-actions/extract > extractPackageFile() > extract
"depName": "docker/setup-qemu-action",
"depType": "action",
"replaceString": "docker/setup-qemu-action@c308fdd69d26ed66f4506ebd74b180abe5362145 # renovate: tag=v1.1.0",
"versioning": "docker",
"versioning": "semver-partial",
},
{
"autoReplaceStringTemplate": "{{depName}}@{{#if newDigest}}{{newDigest}}{{#if newValue}} # {{newValue}}{{/if}}{{/if}}{{#unless newDigest}}{{newValue}}{{/unless}}",
Expand All @@ -31,7 +31,7 @@ exports[`modules/manager/github-actions/extract > extractPackageFile() > extract
"depName": "actions/checkout",
"depType": "action",
"replaceString": "actions/checkout@1.0.0",
"versioning": "docker",
"versioning": "semver-partial",
},
{
"autoReplaceStringTemplate": "{{depName}}@{{#if newDigest}}{{newDigest}}{{#if newValue}} # {{newValue}}{{/if}}{{/if}}{{#unless newDigest}}{{newValue}}{{/unless}}",
Expand All @@ -44,7 +44,7 @@ exports[`modules/manager/github-actions/extract > extractPackageFile() > extract
"enabled": false,
"replaceString": "docker/setup-qemu-action@c308fdd69d26ed66f4506ebd74b180abe5362145",
"skipReason": "unversioned-reference",
"versioning": "docker",
"versioning": "semver-partial",
},
{
"autoReplaceStringTemplate": "{{depName}}@{{#if newDigest}}{{newDigest}}{{#if newValue}} # {{newValue}}{{/if}}{{/if}}{{#unless newDigest}}{{newValue}}{{/unless}}",
Expand All @@ -54,7 +54,7 @@ exports[`modules/manager/github-actions/extract > extractPackageFile() > extract
"depName": "docker/build-push-action",
"depType": "action",
"replaceString": "docker/build-push-action@v2",
"versioning": "docker",
"versioning": "semver-partial",
},
{
"autoReplaceStringTemplate": "{{depName}}@{{#if newDigest}}{{newDigest}}{{#if newValue}} # {{newValue}}{{/if}}{{/if}}{{#unless newDigest}}{{newValue}}{{/unless}}",
Expand All @@ -65,7 +65,7 @@ exports[`modules/manager/github-actions/extract > extractPackageFile() > extract
"depName": "actions/checkout",
"depType": "action",
"replaceString": "actions/checkout@ec3a7ce113134d7a93b817d10a8272cb61118579 # tag=v2.4.0",
"versioning": "docker",
"versioning": "semver-partial",
},
{
"autoReplaceStringTemplate": "{{depName}}@{{#if newDigest}}{{newDigest}}{{#if newValue}} # {{newValue}}{{/if}}{{/if}}{{#unless newDigest}}{{newValue}}{{/unless}}",
Expand All @@ -76,7 +76,7 @@ exports[`modules/manager/github-actions/extract > extractPackageFile() > extract
"depName": "actions-rs/toolchain",
"depType": "action",
"replaceString": "actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # renovate: tag=v1.0.7",
"versioning": "docker",
"versioning": "semver-partial",
},
{
"autoReplaceStringTemplate": "{{depName}}@{{#if newDigest}}{{newDigest}}{{#if newValue}} # {{newValue}}{{/if}}{{/if}}{{#unless newDigest}}{{newValue}}{{/unless}}",
Expand All @@ -86,7 +86,7 @@ exports[`modules/manager/github-actions/extract > extractPackageFile() > extract
"depName": "actions-rs/cargo",
"depType": "action",
"replaceString": "actions-rs/cargo@v1.0.3",
"versioning": "docker",
"versioning": "semver-partial",
},
{
"autoReplaceStringTemplate": "{{depName}}-{{newValue}}",
Expand Down
42 changes: 21 additions & 21 deletions lib/modules/manager/github-actions/extract.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ describe('modules/manager/github-actions/extract', () => {
depName: 'pascalgn/automerge-action',
depType: 'action',
replaceString: '"pascalgn/automerge-action@v0.13.1"',
versioning: 'docker',
versioning: 'semver-partial',
},
{
currentValue: 'v2.3.5',
Expand All @@ -172,23 +172,23 @@ describe('modules/manager/github-actions/extract', () => {
depType: 'action',
replaceString:
'actions/checkout@1e204e9a9253d643386038d443f96446fa156a97 # renovate: tag=v2.3.5',
versioning: 'docker',
versioning: 'semver-partial',
},
{
currentValue: 'v1',
datasource: 'github-tags',
depName: 'actions/checkout',
depType: 'action',
replaceString: 'actions/checkout@v1',
versioning: 'docker',
versioning: 'semver-partial',
},
{
currentValue: 'v1.1.2',
datasource: 'github-tags',
depName: 'actions/checkout',
depType: 'action',
replaceString: '"actions/checkout@v1.1.2"',
versioning: 'docker',
versioning: 'semver-partial',
},
{
currentValue: '1.37.0-glibc',
Expand Down Expand Up @@ -236,7 +236,7 @@ describe('modules/manager/github-actions/extract', () => {
depName: 'actions/setup-node',
commitMessageTopic: '{{{depName}}} action',
datasource: 'github-tags',
versioning: 'docker',
versioning: 'semver-partial',
depType: 'action',
replaceString:
'actions/setup-node@56337c425554a6be30cdef71bf441f15be286854 # tag=v3.1.1',
Expand All @@ -249,7 +249,7 @@ describe('modules/manager/github-actions/extract', () => {
depName: 'actions/setup-node',
commitMessageTopic: '{{{depName}}} action',
datasource: 'github-tags',
versioning: 'docker',
versioning: 'semver-partial',
depType: 'action',
replaceString:
"'actions/setup-node@1f8c6b94b26d0feae1e387ca63ccbdc44d27b561' # tag=v3.1.1",
Expand All @@ -262,7 +262,7 @@ describe('modules/manager/github-actions/extract', () => {
depName: 'actions/setup-node',
commitMessageTopic: '{{{depName}}} action',
datasource: 'github-tags',
versioning: 'docker',
versioning: 'semver-partial',
depType: 'action',
replaceString:
'"actions/setup-node@1f8c6b94b26d0feae1e387ca63ccbdc44d27b561" # tag=v2.5.1',
Expand All @@ -275,7 +275,7 @@ describe('modules/manager/github-actions/extract', () => {
depName: 'actions/checkout',
commitMessageTopic: '{{{depName}}} action',
datasource: 'github-tags',
versioning: 'docker',
versioning: 'semver-partial',
depType: 'action',
replaceString: '"actions/checkout@v2"',
autoReplaceStringTemplate:
Expand All @@ -286,7 +286,7 @@ describe('modules/manager/github-actions/extract', () => {
depName: 'actions/setup-java',
commitMessageTopic: '{{{depName}}} action',
datasource: 'github-tags',
versioning: 'docker',
versioning: 'semver-partial',
depType: 'action',
replaceString: '"actions/setup-java@v2"',
autoReplaceStringTemplate:
Expand Down Expand Up @@ -575,7 +575,7 @@ describe('modules/manager/github-actions/extract', () => {
expect(res?.deps[0]).toEqual({
depName: 'actions/checkout',
commitMessageTopic: '{{{depName}}} action',
versioning: 'docker',
versioning: 'semver-partial',
depType: 'action',
replaceString:
'actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v4',
Expand All @@ -600,7 +600,7 @@ describe('modules/manager/github-actions/extract', () => {
expect(res?.deps[0]).toEqual({
depName: 'actions/checkout',
commitMessageTopic: '{{{depName}}} action',
versioning: 'docker',
versioning: 'semver-partial',
depType: 'action',
replaceString: 'actions/checkout@c85c95e # v4',
autoReplaceStringTemplate:
Expand Down Expand Up @@ -776,7 +776,7 @@ describe('modules/manager/github-actions/extract', () => {
depName: 'actions/setup-node',
depType: 'action',
replaceString: 'actions/setup-node@v3',
versioning: 'docker',
versioning: 'semver-partial',
},
{
autoReplaceStringTemplate:
Expand All @@ -787,7 +787,7 @@ describe('modules/manager/github-actions/extract', () => {
depName: 'actions/setup-node',
depType: 'action',
replaceString: 'actions/setup-node@v3',
versioning: 'docker',
versioning: 'semver-partial',
},
{
autoReplaceStringTemplate:
Expand All @@ -798,7 +798,7 @@ describe('modules/manager/github-actions/extract', () => {
depName: 'actions/setup-go',
depType: 'action',
replaceString: 'actions/setup-go@v5',
versioning: 'docker',
versioning: 'semver-partial',
},
{
autoReplaceStringTemplate:
Expand All @@ -809,7 +809,7 @@ describe('modules/manager/github-actions/extract', () => {
depName: 'actions/setup-python',
depType: 'action',
replaceString: 'actions/setup-python@v3',
versioning: 'docker',
versioning: 'semver-partial',
},
{
autoReplaceStringTemplate:
Expand All @@ -820,7 +820,7 @@ describe('modules/manager/github-actions/extract', () => {
depName: 'actions/setup-node',
depType: 'action',
replaceString: 'actions/setup-node@v3',
versioning: 'docker',
versioning: 'semver-partial',
},
{
depName: 'node',
Expand Down Expand Up @@ -926,7 +926,7 @@ describe('modules/manager/github-actions/extract', () => {
depName: 'actions/setup-node',
depType: 'action',
replaceString: 'actions/setup-node@v3',
versioning: 'docker',
versioning: 'semver-partial',
},
{
autoReplaceStringTemplate:
Expand All @@ -937,7 +937,7 @@ describe('modules/manager/github-actions/extract', () => {
depName: 'actions/setup-node',
depType: 'action',
replaceString: 'actions/setup-node@v3',
versioning: 'docker',
versioning: 'semver-partial',
},
{
autoReplaceStringTemplate:
Expand All @@ -948,7 +948,7 @@ describe('modules/manager/github-actions/extract', () => {
depName: 'actions/setup-go',
depType: 'action',
replaceString: 'actions/setup-go@v5',
versioning: 'docker',
versioning: 'semver-partial',
},
{
autoReplaceStringTemplate:
Expand All @@ -959,7 +959,7 @@ describe('modules/manager/github-actions/extract', () => {
depName: 'actions/setup-python',
depType: 'action',
replaceString: 'actions/setup-python@v3',
versioning: 'docker',
versioning: 'semver-partial',
},
{
autoReplaceStringTemplate:
Expand All @@ -970,7 +970,7 @@ describe('modules/manager/github-actions/extract', () => {
depName: 'actions/setup-node',
depType: 'action',
replaceString: 'actions/setup-node@v3',
versioning: 'docker',
versioning: 'semver-partial',
},
{
depName: 'node',
Expand Down
3 changes: 2 additions & 1 deletion lib/modules/manager/github-actions/extract.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import * as dockerVersioning from '../../versioning/docker/index.ts';
import * as exactVersioning from '../../versioning/exact/index.ts';
import * as nodeVersioning from '../../versioning/node/index.ts';
import * as npmVersioning from '../../versioning/npm/index.ts';
import * as semverPartialVersioning from '../../versioning/semver-partial/index.ts';
import { getDep } from '../dockerfile/extract.ts';
import type {
ExtractConfig,
Expand Down Expand Up @@ -86,7 +87,7 @@ function extractRepositoryAction(
const dep: PackageDependency = {
depName,
commitMessageTopic: '{{{depName}}} action',
versioning: dockerVersioning.id,
versioning: semverPartialVersioning.id,
depType: 'action',
replaceString: valueString,
autoReplaceStringTemplate: `${quote}{{depName}}${pathSuffix}@{{#if newDigest}}{{newDigest}}${quote}{{#if newValue}}${commentWs}# {{newValue}}{{/if}}{{/if}}{{#unless newDigest}}{{newValue}}${quote}{{/unless}}`,
Expand Down
Loading