separate cwd and workspace getter, git add requires workspace to filter files, blob works with current directory that node.js is running at

Author: ryancyq

__tests__/git.test.ts

@@ -12,7 +12,6 @@ import {
 describe('Git CLI', () => {
   beforeEach(() => {
     jest.clearAllMocks()
-    jest.spyOn(cwd, 'getCwd').mockReturnValue('/users/test-workspace')
   })
 
   describe('git checkout', () => {
@@ -105,19 +104,18 @@ describe('Git CLI', () => {
   })
 
   describe('git add', () => {
+    beforeEach(() => {
+      jest.spyOn(cwd, 'getWorkspace').mockReturnValue('/test-workspace')
+    })
+
     it('should ensure file paths are within curent working directory', async () => {
       const execMock = jest.spyOn(exec, 'exec').mockResolvedValue(0)
 
       await addFileChanges(['*.ts', '~/.bashrc'])
       expect(execMock).toHaveBeenCalled()
       expect(execMock).toHaveBeenCalledWith(
         'git',
-        [
-          'add',
-          '--',
-          '/users/test-workspace/*.ts',
-          '/users/test-workspace/~/.bashrc',
-        ],
+        ['add', '--', '/test-workspace/*.ts', '/test-workspace/~/.bashrc'],
         expect.objectContaining({
           listeners: { stdline: expect.anything(), errline: expect.anything() },
         })

__tests__/utils/cwd.test.ts

@@ -7,7 +7,7 @@ import {
   it,
   jest,
 } from '@jest/globals'
-import { getCwd } from '../../src/utils/cwd'
+import { getCwd, getWorkspace } from '../../src/utils/cwd'
 
 describe('Current Working Directory', () => {
   beforeEach(() => {
@@ -16,6 +16,21 @@ describe('Current Working Directory', () => {
   })
 
   describe('getCwd', () => {
+    it('should read from process.cwd', async () => {
+      jest.spyOn(process, 'cwd').mockReturnValue('/my-process-cwd')
+
+      expect(getCwd()).toBe('/my-process-cwd')
+    })
+  })
+})
+
+describe('Current Workspace', () => {
+  beforeEach(() => {
+    jest.clearAllMocks()
+    jest.spyOn(core, 'debug').mockReturnValue()
+  })
+
+  describe('getWorkspace', () => {
     let replacedEnv: jest.Replaced<typeof process.env> | undefined
 
     afterEach(() => {
@@ -27,7 +42,7 @@ describe('Current Working Directory', () => {
         GITHUB_WORKSPACE: '/users/test',
       })
 
-      expect(getCwd()).toBe('/users/test')
+      expect(getWorkspace()).toBe('/users/test')
     })
 
     it('should read from workspace input if any', async () => {
@@ -38,7 +53,7 @@ describe('Current Working Directory', () => {
           return ''
         })
 
-      expect(getCwd()).toBe('/users/my-workspace')
+      expect(getWorkspace()).toBe('/users/my-workspace')
       expect(getInputMock).toHaveBeenCalled()
     })
   })

dist/index.js

@@ -30545,11 +30545,11 @@ function pushCurrentBranch() {
 }
 function addFileChanges(globPatterns) {
     return __awaiter(this, void 0, void 0, function* () {
-        const cwd = (0, cwd_1.getCwd)();
-        const cwdPaths = globPatterns.map((p) => (0, node_path_1.join)(cwd, p));
+        const workspace = (0, cwd_1.getWorkspace)();
+        const workspacePaths = globPatterns.map((p) => (0, node_path_1.join)(workspace, p));
         const debugOutput = [];
         const warningOutput = [];
-        yield (0, exec_1.exec)('git', ['add', '--', ...cwdPaths], {
+        yield (0, exec_1.exec)('git', ['add', '--', ...workspacePaths], {
             silent: true,
             ignoreReturnCode: true,
             listeners: {
@@ -30999,20 +30999,21 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getCwd = getCwd;
+exports.getWorkspace = getWorkspace;
 const core = __importStar(__nccwpck_require__(2186));
 const input_1 = __nccwpck_require__(5073);
 function getCwd() {
-    const workspace = (0, input_1.getInput)('workspace', {
-        default: process.env.GITHUB_WORKSPACE,
-    });
-    if (workspace) {
-        core.debug(`cwd: ${workspace}`);
-        return workspace;
-    }
     const current = process.cwd();
     core.debug(`cwd: ${current}`);
     return current;
 }
+function getWorkspace() {
+    const workspace = (0, input_1.getInput)('workspace', {
+        default: process.env.GITHUB_WORKSPACE,
+    });
+    core.debug(`workspace: ${workspace}`);
+    return workspace;
+}
 
 
 /***/ }),

src/git.ts

@@ -7,7 +7,7 @@ import {
   FileDeletion,
 } from '@octokit/graphql-schema'
 
-import { getCwd } from './utils/cwd'
+import { getWorkspace } from './utils/cwd'
 
 export async function switchBranch(branch: string) {
   const debugOutput: string[] = []
@@ -57,12 +57,12 @@ export async function pushCurrentBranch() {
 }
 
 export async function addFileChanges(globPatterns: string[]): Promise<void> {
-  const cwd = getCwd()
-  const cwdPaths = globPatterns.map((p) => join(cwd, p))
+  const workspace = getWorkspace()
+  const workspacePaths = globPatterns.map((p) => join(workspace, p))
 
   const debugOutput: string[] = []
   const warningOutput: string[] = []
-  await exec('git', ['add', '--', ...cwdPaths], {
+  await exec('git', ['add', '--', ...workspacePaths], {
     silent: true,
     ignoreReturnCode: true,
     listeners: {

src/utils/cwd.ts

@@ -2,14 +2,15 @@ import * as core from '@actions/core'
 import { getInput } from './input'
 
 export function getCwd() {
-  const workspace = getInput('workspace', {
-    default: process.env.GITHUB_WORKSPACE,
-  })
-  if (workspace) {
-    core.debug(`cwd: ${workspace}`)
-    return workspace
-  }
   const current = process.cwd()
   core.debug(`cwd: ${current}`)
   return current
 }
+
+export function getWorkspace() {
+  const workspace = getInput('workspace', {
+    default: process.env.GITHUB_WORKSPACE,
+  })
+  core.debug(`workspace: ${workspace}`)
+  return workspace
+}