accept old and new repo dirs as args

__tests__/diff.test.ts

@@ -87,7 +87,6 @@ describe('diff.ts', () => {
       const configuration = 'configuration'
       const tempDirs: TempDirs = {
         root: '/temp',
-        baseRepo: '/temp/base-repo',
         result: '/temp/result'
       }
 
@@ -115,6 +114,8 @@ describe('diff.ts', () => {
       const result = await calculateDiffResults(
         jarPath,
         configuration,
+        'old',
+        'new',
         tempDirs
       )
 
@@ -138,7 +139,6 @@ describe('diff.ts', () => {
       const configuration = 'configuration'
       const tempDirs: TempDirs = {
         root: '/temp',
-        baseRepo: '/temp/base-repo',
         result: '/temp/result'
       }
 
@@ -150,6 +150,8 @@ describe('diff.ts', () => {
       const result = await calculateDiffResults(
         jarPath,
         configuration,
+        'old',
+        'new',
         tempDirs
       )
 

__tests__/main.test.ts

@@ -1,12 +1,5 @@
-import {
-  calculateDiffResults,
-  cloneBaseRepository,
-  createTempDirs,
-  getGitUrl
-} from '../src/main'
+import { calculateDiffResults, createTempDirs } from '../src/main'
 import { expect, jest } from '@jest/globals'
-import * as exec from '@actions/exec'
-import * as github from '@actions/github'
 import * as utils from '../src/utils.js'
 import * as io from '@actions/io'
 import * as gradle from '../src/gradle.js'
@@ -32,56 +25,12 @@ describe('main.ts', () => {
 
       expect(result).toEqual({
         root: '/temp',
-        baseRepo: '/temp/base-repo',
         result: '/temp/result'
       })
-      expect(mkdirP).toHaveBeenCalledWith('/temp/base-repo')
       expect(mkdirP).toHaveBeenCalledWith('/temp/result')
     })
   })
 
-  describe('getGitUrl', () => {
-    beforeEach(() => {
-      process.env.GITHUB_REPOSITORY = 'owner/repo'
-    })
-    it('personal token', () => {
-      const actual = getGitUrl('ghp_token')
-      expect(actual).toEqual('https://[email protected]/owner/repo')
-    })
-    it('not personal token', () => {
-      const actual = getGitUrl('token')
-      expect(actual).toEqual(
-        'https://x-access-token:[email protected]/owner/repo'
-      )
-    })
-  })
-
-  describe('cloneBaseRepository', () => {
-    const mockExec = jest.spyOn(exec, 'exec')
-
-    it('test', async () => {
-      const gitUrl = 'gitUrl'
-      const baseRepoDir = 'baseRepoDir'
-
-      mockExec.mockResolvedValue(0)
-      jest.replaceProperty(github, 'context', {
-        payload: { pull_request: { base: { ref: 'main' } } }
-      } as never)
-
-      await cloneBaseRepository('gitUrl', 'baseRepoDir')
-
-      expect(mockExec).toHaveBeenCalledWith('git', [
-        'clone',
-        '--depth',
-        '1',
-        '-b',
-        'main',
-        gitUrl,
-        baseRepoDir
-      ])
-    })
-  })
-
   describe('calculateDiffResults', () => {
     const mockGenerateDependenciesFiles = jest.spyOn(
       gradle,
@@ -92,7 +41,6 @@ describe('main.ts', () => {
     it('test', async () => {
       const tempDirs: TempDirs = {
         root: '/temp',
-        baseRepo: '/temp/base-repo',
         result: '/temp/result'
       }
 
@@ -120,6 +68,8 @@ describe('main.ts', () => {
       const result = await calculateDiffResults(
         'jarPath',
         ['c1', 'c2'],
+        'old',
+        'new',
         tempDirs
       )
       expect(result).toEqual([

action.yml

@@ -20,6 +20,17 @@ inputs:
       separated by commas.'
     required: false
     default: 'runtimeClasspath'
+  old-repo-dir:
+    description:
+      'The location within the workspace holding the base version of the repo.'
+    required: false
+    default: 'old'
+  new-repo-dir:
+    description:
+      'The location within the workspace holding the updated version of the
+      repo.'
+    required: false
+    default: 'new'
   post-pr-comment:
     description:
       'If true, posts a PR comment when there are dependency differences.'

src/diff.ts

@@ -27,6 +27,8 @@ export async function downloadJar(
 export async function calculateDiffResults(
   jarPath: string,
   configuration: string,
+  oldRepoDir: string,
+  newRepoDir: string,
   tempDirs: TempDirs
 ): Promise<DiffResult[]> {
   const results: DiffResult[] = []
@@ -35,14 +37,18 @@ export async function calculateDiffResults(
   )
   for (const filePath of await globber.glob()) {
     const oldFilePath = path.join(
-      tempDirs.baseRepo,
+      oldRepoDir,
+      removePrefix(filePath, process.env.GITHUB_WORKSPACE + path.sep)
+    )
+    const newFilePath = path.join(
+      newRepoDir,
       removePrefix(filePath, process.env.GITHUB_WORKSPACE + path.sep)
     )
     const result = await execDiff(
       jarPath,
       configuration,
-      filePath,
       oldFilePath,
+      newFilePath,
       tempDirs.result
     )
     if (result) {
@@ -57,6 +63,7 @@ export function sortDiffResults(results: DiffResult[]) {
     if (a.project === b.project) {
       return a.configuration.localeCompare(b.configuration)
     } else {
+      // TODO: fix
       if (a.project === 'gradle-root-project') return -1
       if (b.project === 'gradle-root-project') return 1
       return a.project.localeCompare(b.project)
@@ -67,19 +74,19 @@ export function sortDiffResults(results: DiffResult[]) {
 async function execDiff(
   jarPath: string,
   configuration: string,
-  filePath: string,
   oldFilePath: string,
+  newFilePath: string,
   resultDir: string
 ): Promise<DiffResult | undefined> {
   if (!fs.existsSync(oldFilePath)) {
     return
   }
 
-  const project = getProjectFromFile(filePath)
+  const project = getProjectFromFile(newFilePath)
 
   const output = await exec.getExecOutput(
     'java',
-    ['-jar', jarPath, oldFilePath, filePath],
+    ['-jar', jarPath, oldFilePath, newFilePath],
     { silent: true }
   )
   if (output.stdout) {