Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Empty Cache save when the path is github workspace directory #1132

Merged
merged 8 commits into from
Jul 26, 2022
Merged

Fix Empty Cache save when the path is github workspace directory #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
120202a
Fix empty cache save on using or github.workspace(#833 in actions/ca…
lvpx Jul 13, 2022
593bc70
Fix testcase for resolvePaths works on current directory
lvpx Jul 13, 2022
da6701a
Fix linting for changes
lvpx Jul 13, 2022
67cb82d
Fix failing resolvePaths testcase
lvpx Jul 14, 2022
ec95a9b
Fix failing resolvePaths testcase
lvpx Jul 14, 2022
2a37ee7
Merge branch 'pdotl-empty-cache-bugfix' of https://github.com/actions…
lvpx Jul 14, 2022
83bca5c
Remove unnecessary import
lvpx Jul 14, 2022
e98bae8
Change testcase to test against github workspace directory instead of…
lvpx Jul 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions packages/cache/__tests__/cacheUtils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,9 @@ test('assertDefined throws if undefined', () => {
test('assertDefined returns value', () => {
expect(cacheUtils.assertDefined('test', 5)).toBe(5)
})

test('resolvePaths works on github workspace directory', async () => {
const workspace = process.env['GITHUB_WORKSPACE'] ?? '.'
const paths = await cacheUtils.resolvePaths([workspace])
expect(paths.length).toBeGreaterThan(0)
})
7 changes: 6 additions & 1 deletion packages/cache/src/internal/cacheUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,12 @@ export async function resolvePaths(patterns: string[]): Promise<string[]> {
.replace(new RegExp(`\\${path.sep}`, 'g'), '/')
core.debug(`Matched: ${relativeFile}`)
// Paths are made relative so the tar entries are all relative to the root of the workspace.
paths.push(`${relativeFile}`)
if (relativeFile === '') {
// path.relative returns empty string if workspace and file are equal
paths.push('.')
} else {
paths.push(`${relativeFile}`)
}
}

return paths
Expand Down