fix(bundler): Set exec cwd to lock file (#24379)

renovatebot · Sep 13, 2023 · ef504c0 · ef504c0
1 parent c5aae24
commit ef504c0
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/lib/modules/manager/bundler/artifacts.spec.ts b/lib/modules/manager/bundler/artifacts.spec.ts
@@ -103,6 +103,29 @@ describe('modules/manager/bundler/artifacts', () => {
       ]);
     });
 
+    it('executes commands from lockFile path', async () => {
+      fs.readLocalFile.mockResolvedValueOnce('Current Gemfile.lock');
+      fs.writeLocalFile.mockResolvedValueOnce();
+      const execSnapshots = mockExecAll();
+      git.getRepoStatus.mockResolvedValueOnce(
+        partial<StatusResult>({
+          modified: [],
+        })
+      );
+      fs.readLocalFile.mockResolvedValueOnce('Updated Gemfile.lock');
+      expect(
+        await updateArtifacts({
+          packageFileName: 'teamA/Gemfile',
+          updatedDeps: [{ depName: 'foo' }, { depName: 'bar' }],
+          newPackageFileContent: 'Updated Gemfile content',
+          config,
+        })
+      ).toBeNull();
+      expect(execSnapshots).toMatchObject([
+        { options: { cwd: '/tmp/github/some/repo' } },
+      ]);
+    });
+
     it('works for default binarySource', async () => {
       fs.readLocalFile.mockResolvedValueOnce('Current Gemfile.lock');
       fs.readLocalFile.mockResolvedValueOnce(null);

diff --git a/lib/modules/manager/bundler/artifacts.ts b/lib/modules/manager/bundler/artifacts.ts
@@ -174,7 +174,7 @@ export async function updateArtifacts(
     }
 
     const execOptions: ExecOptions = {
-      cwdFile: packageFileName,
+      cwdFile: lockFileName,
       extraEnv: {
         ...bundlerHostRulesVariables,
         GEM_HOME: await ensureCacheDir('bundler'),

diff --git a/lib/modules/manager/bundler/common.ts b/lib/modules/manager/bundler/common.ts
@@ -76,8 +76,9 @@ export function getBundlerConstraint(
 export async function getLockFilePath(
   packageFilePath: string
 ): Promise<string> {
-  logger.debug(`Looking for lockfile for ${packageFilePath}`);
-  return (await localPathExists(`${packageFilePath}.lock`))
+  const lockFilePath = (await localPathExists(`${packageFilePath}.lock`))
     ? `${packageFilePath}.lock`
     : `Gemfile.lock`;
+  logger.debug(`Lockfile for ${packageFilePath} found in ${lockFilePath}`);
+  return lockFilePath;
 }