From 34441c5ed98d706e9608cb9359c6e922a17660af Mon Sep 17 00:00:00 2001
From: Ben Langfeld <ben@langfeld.me>
Date: Tue, 30 Jan 2024 04:42:01 -0300
Subject: [PATCH] fix(manager/bundler): Update conservatively if strict fails
 (#26929)

Co-authored-by: Rhys Arkins <rhys@arkins.net>
---
 lib/modules/manager/bundler/artifacts.spec.ts | 32 +++++++++++++++++++
 lib/modules/manager/bundler/artifacts.ts      | 19 +++++++++++
 2 files changed, 51 insertions(+)

diff --git a/lib/modules/manager/bundler/artifacts.spec.ts b/lib/modules/manager/bundler/artifacts.spec.ts
index a9997153188c79..114ad5d8995d2f 100644
--- a/lib/modules/manager/bundler/artifacts.spec.ts
+++ b/lib/modules/manager/bundler/artifacts.spec.ts
@@ -881,6 +881,38 @@ describe('modules/manager/bundler/artifacts', () => {
           { cmd: 'bundler lock --update foo bar' },
         ]);
       });
+
+      it('handles failure of strict updating', async () => {
+        const execError = new ExecError('Exec error', {
+          cmd: '',
+          stdout: '',
+          stderr: 'version solving has failed',
+          options: { encoding: 'utf8' },
+        });
+        fs.readLocalFile.mockResolvedValue('Current Gemfile.lock');
+        const execSnapshots = mockExecSequence([
+          execError,
+          { stdout: '', stderr: '' },
+        ]);
+        git.getRepoStatus.mockResolvedValueOnce(
+          partial<StatusResult>({
+            modified: ['Gemfile.lock'],
+          }),
+        );
+
+        const res = await updateArtifacts({
+          packageFileName: 'Gemfile',
+          updatedDeps: [{ depName: 'foo', updateType: 'minor' }],
+          newPackageFileContent: '{}',
+          config,
+        });
+
+        expect(res).toMatchObject([{ file: { path: 'Gemfile.lock' } }]);
+        expect(execSnapshots).toMatchObject([
+          { cmd: 'bundler lock --minor --strict --update foo' },
+          { cmd: 'bundler lock --minor --conservative --update foo' },
+        ]);
+      });
     });
   });
 });
diff --git a/lib/modules/manager/bundler/artifacts.ts b/lib/modules/manager/bundler/artifacts.ts
index 94fc4ad54c506c..e7c5f7dd43d3a2 100644
--- a/lib/modules/manager/bundler/artifacts.ts
+++ b/lib/modules/manager/bundler/artifacts.ts
@@ -245,6 +245,25 @@ export async function updateArtifacts(
       memCache.set('bundlerArtifactsError', BUNDLER_INVALID_CREDENTIALS);
       throw new Error(BUNDLER_INVALID_CREDENTIALS);
     }
+    if (recursionLimit > 0 && output.includes('version solving has failed')) {
+      logger.debug('Failed to lock strictly, retrying non-strict');
+      const newConfig = {
+        ...config,
+        postUpdateOptions: [
+          ...(config.postUpdateOptions ?? []),
+          'bundlerConservative',
+        ],
+      };
+      return updateArtifacts(
+        {
+          packageFileName,
+          updatedDeps,
+          newPackageFileContent,
+          config: newConfig,
+        },
+        recursionLimit - 1,
+      );
+    }
     const resolveMatches: string[] = getResolvedPackages(output).filter(
       (depName) => !updatedDepNames.includes(depName),
     );