Merge 153edf5a75 into 73b842fe3a

Co-authored-by: Michael Kriese <michael.kriese@gmx.de>

docs/usage/configuration-options.md

@@ -3707,6 +3707,7 @@ This feature works with the following managers:
 - [`dockerfile`](modules/manager/dockerfile/index.md)
 - [`droneci`](modules/manager/droneci/index.md)
 - [`flux`](modules/manager/flux/index.md)
+- [`github-actions`](modules/manager/github-actions/index.md)
 - [`gitlabci`](modules/manager/gitlabci/index.md)
 - [`helm-requirements`](modules/manager/helm-requirements/index.md)
 - [`helm-values`](modules/manager/helm-values/index.md)

lib/modules/manager/bundler/artifacts.ts

@@ -93,7 +93,10 @@ export async function updateArtifacts(
 
     const commands: string[] = [];
 
-    if (config.isLockFileMaintenance) {
+    if (
+      updatedDeps.some((dep) => dep.updateType === 'lockFileMaintenance') ||
+      config.isLockFileMaintenance
+    ) {
       commands.push('bundler lock --update');
     } else {
       const bundlerUpgraded = updatedDeps
@@ -289,6 +292,7 @@ export async function updateArtifacts(
     if (
       recursionLimit > 0 &&
       resolveMatches.length &&
+      config.updateType !== 'lockFileMaintenance' &&
       !config.isLockFileMaintenance
     ) {
       logger.debug(

lib/modules/manager/composer/artifacts.spec.ts

@@ -725,8 +725,8 @@ describe('modules/manager/composer/artifacts', () => {
         updatedDeps: [],
         newPackageFileContent: '{}',
         config: {
+          updateType: 'lockFileMaintenance',
           ...config,
-          isLockFileMaintenance: true,
         },
       }),
     ).toEqual([

lib/modules/manager/composer/artifacts.ts

@@ -113,6 +113,8 @@ export async function updateArtifacts({
 
   const file = Json.pipe(PackageFile).parse(newPackageFileContent);
 
+  const isLockFileMaintenance =
+    config.updateType === 'lockFileMaintenance' || config.isLockFileMaintenance;
   const lockFileName = packageFileName.replace(regEx(/\.json$/), '.lock');
   const lockfile = await z
     .string()
@@ -174,7 +176,7 @@ export async function updateArtifacts({
 
     const cmd = 'composer';
     let args: string;
-    if (config.isLockFileMaintenance) {
+    if (isLockFileMaintenance) {
       args = 'update';
     } else {
       args =

lib/modules/manager/github-actions/extract.ts

@@ -10,7 +10,11 @@ import { GithubRunnersDatasource } from '../../datasource/github-runners';
 import { GithubTagsDatasource } from '../../datasource/github-tags';
 import * as dockerVersioning from '../../versioning/docker';
 import { getDep } from '../dockerfile/extract';
-import type { PackageDependency, PackageFileContent } from '../types';
+import type {
+  ExtractConfig,
+  PackageDependency,
+  PackageFileContent,
+} from '../types';
 import type { Workflow } from './types';
 
 const dockerActionRe = regEx(/^\s+uses\s*: ['"]?docker:\/\/([^'"]+)\s*$/);
@@ -44,7 +48,10 @@ function detectCustomGitHubRegistryUrlsForActions(): PackageDependency {
   return {};
 }
 
-function extractWithRegex(content: string): PackageDependency[] {
+function extractWithRegex(
+  content: string,
+  config: ExtractConfig,
+): PackageDependency[] {
   const customRegistryUrlsPackageDependency =
     detectCustomGitHubRegistryUrlsForActions();
   logger.trace('github-actions.extractWithRegex()');
@@ -57,7 +64,7 @@ function extractWithRegex(content: string): PackageDependency[] {
     const dockerMatch = dockerActionRe.exec(line);
     if (dockerMatch) {
       const [, currentFrom] = dockerMatch;
-      const dep = getDep(currentFrom);
+      const dep = getDep(currentFrom, true, config.registryAliases);
       dep.depType = 'docker';
       deps.push(dep);
       continue;
@@ -126,11 +133,14 @@ function detectDatasource(registryUrl: string): PackageDependency {
   };
 }
 
-function extractContainer(container: unknown): PackageDependency | undefined {
+function extractContainer(
+  container: unknown,
+  registryAliases: Record<string, string> | undefined,
+): PackageDependency | undefined {
   if (is.string(container)) {
-    return getDep(container);
+    return getDep(container, true, registryAliases);
   } else if (is.plainObject(container) && is.string(container.image)) {
-    return getDep(container.image);
+    return getDep(container.image, true, registryAliases);
   }
   return undefined;
 }
@@ -181,6 +191,7 @@ function extractRunners(runner: unknown): PackageDependency[] {
 function extractWithYAMLParser(
   content: string,
   packageFile: string,
+  config: ExtractConfig,
 ): PackageDependency[] {
   logger.trace('github-actions.extractWithYAMLParser()');
   const deps: PackageDependency[] = [];
@@ -198,14 +209,14 @@ function extractWithYAMLParser(
   }
 
   for (const job of Object.values(pkg?.jobs ?? {})) {
-    const dep = extractContainer(job?.container);
+    const dep = extractContainer(job?.container, config.registryAliases);
     if (dep) {
       dep.depType = 'container';
       deps.push(dep);
     }
 
     for (const service of Object.values(job?.services ?? {})) {
-      const dep = extractContainer(service);
+      const dep = extractContainer(service, config.registryAliases);
       if (dep) {
         dep.depType = 'service';
         deps.push(dep);
@@ -221,11 +232,12 @@ function extractWithYAMLParser(
 export function extractPackageFile(
   content: string,
   packageFile: string,
+  config: ExtractConfig = {}, // TODO: enforce ExtractConfig
 ): PackageFileContent | null {
   logger.trace(`github-actions.extractPackageFile(${packageFile})`);
   const deps = [
-    ...extractWithRegex(content),
+    ...extractWithRegex(content, config),
-    ...extractWithYAMLParser(content, packageFile),
+    ...extractWithYAMLParser(content, packageFile, config),
   ];
   if (!deps.length) {
     return null;

lib/modules/manager/gradle/artifacts.ts

@@ -161,7 +161,8 @@ export async function updateArtifacts({
   }
 
   if (
-    config.isLockFileMaintenance &&
+    (config.updateType === 'lockFileMaintenance' ||
+      config.isLockFileMaintenance) &&
     (!isGradleBuildFile(packageFileName) ||
       dirname(packageFileName) !== dirname(gradlewFile))
   ) {
@@ -205,7 +206,8 @@ export async function updateArtifacts({
         .join(' ')}`;
 
       if (
-        config.isLockFileMaintenance === true ||
+        config.updateType === 'lockFileMaintenance' ||
+        config.isLockFileMaintenance ||
         !updatedDeps.length ||
         isGcvPropsFile(packageFileName)
       ) {

lib/modules/manager/jsonnet-bundler/artifacts.ts

@@ -48,7 +48,10 @@ export async function updateArtifacts(
   };
 
   try {
-    if (config.isLockFileMaintenance) {
+    if (
+      config.updateType === 'lockFileMaintenance' ||
+      config.isLockFileMaintenance
+    ) {
       await exec('jb update', execOptions);
     } else {
       const dependencyUrls = updatedDeps.map(dependencyUrl);

lib/modules/manager/nix/artifacts.spec.ts

@@ -34,7 +34,6 @@ const dockerAdminConfig = {
 process.env.CONTAINERBASE = 'true';
 
 const config: UpdateArtifactsConfig = {};
-const lockMaintenanceConfig = { ...config, isLockFileMaintenance: true };
 const updateInputCmd = `nix \
 --extra-experimental-features 'nix-command flakes' \
 flake lock --update-input nixpkgs`;
@@ -294,7 +293,7 @@ describe('modules/manager/nix/artifacts', () => {
       packageFileName: 'flake.nix',
       updatedDeps: [{ depName: 'nixpkgs' }],
       newPackageFileContent: '{}',
-      config: lockMaintenanceConfig,
+      config: { updateType: 'lockFileMaintenance', ...config },
     });
 
     expect(res).toEqual([

lib/modules/manager/nix/artifacts.ts

@@ -17,6 +17,9 @@ export async function updateArtifacts({
 }: UpdateArtifact): Promise<UpdateArtifactsResult[] | null> {
   const lockFileName = packageFileName.replace(regEx(/\.nix$/), '.lock');
   const existingLockFileContent = await readLocalFile(lockFileName, 'utf8');
+  const isLockFileMaintenance =
+    config.updateType === 'lockFileMaintenance' || config.isLockFileMaintenance;
+
   if (!existingLockFileContent) {
     logger.debug('No flake.lock found');
     return null;
@@ -35,7 +38,7 @@ export async function updateArtifacts({
     cmd += `--extra-access-tokens github.com=${token} `;
   }
 
-  if (config.isLockFileMaintenance) {
+  if (isLockFileMaintenance) {
     cmd += 'flake update';
   } else {
     const inputs = updatedDeps

lib/modules/manager/nuget/artifacts.spec.ts

@@ -189,7 +189,7 @@ describe('modules/manager/nuget/artifacts', () => {
         newPackageFileContent: '{}',
         config: {
           ...config,
-          isLockFileMaintenance: true,
+          updateType: 'lockFileMaintenance',
         },
       }),
     ).toEqual([

lib/modules/manager/nuget/artifacts.ts

@@ -138,7 +138,11 @@ export async function updateArtifacts({
   }
 
   try {
-    if (updatedDeps.length === 0 && config.isLockFileMaintenance !== true) {
+    if (
+      updatedDeps.length === 0 &&
+      config.updateType !== 'lockFileMaintenance' &&
+      config.isLockFileMaintenance !== true
+    ) {
       logger.debug(
         `Not updating lock file because no deps changed and no lock file maintenance.`,
       );

lib/modules/manager/pip-compile/artifacts.ts

@@ -110,7 +110,10 @@ export async function updateArtifacts({
     try {
       await writeLocalFile(inputFileName, newInputContent);
       // TODO(not7cd): use --upgrade option instead deleting
-      if (config.isLockFileMaintenance) {
+      if (
+        config.updateType === 'lockFileMaintenance' ||
+        config.isLockFileMaintenance
+      ) {
         await deleteLocalFile(outputFileName);
       }
       const compileArgs = extractHeaderCommand(existingOutput, outputFileName);

lib/modules/manager/pipenv/artifacts.ts

@@ -135,7 +135,10 @@ export async function updateArtifacts({
   }
   try {
     await writeLocalFile(pipfileName, newPipfileContent);
-    if (config.isLockFileMaintenance) {
+    if (
+      config.updateType === 'lockFileMaintenance' ||
+      config.isLockFileMaintenance
+    ) {
       await deleteLocalFile(lockFileName);
     }
     const cmd = 'pipenv lock';