From 8ccf58a6eb6f9bafb340a1d7eb52550fd4dd467b Mon Sep 17 00:00:00 2001 From: Lovepreet Singh Date: Wed, 13 Jul 2022 11:39:29 +0000 Subject: [PATCH 1/7] Fix empty cache save on using or github.workspace(#833 in actions/cache) as path --- __tests__/cacheUtils.test.ts | 5 +++++ src/internal/cacheUtils.ts | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/__tests__/cacheUtils.test.ts b/__tests__/cacheUtils.test.ts index f1f9557..c5817f2 100644 --- a/__tests__/cacheUtils.test.ts +++ b/__tests__/cacheUtils.test.ts @@ -32,3 +32,8 @@ test('assertDefined throws if undefined', () => { test('assertDefined returns value', () => { expect(cacheUtils.assertDefined('test', 5)).toBe(5) }) + +test('resolvePaths works on current directory', async () => { + const resolvedPath = await cacheUtils.resolvePaths(['.']) + expect(resolvedPath).toBe(['.']) +}) diff --git a/src/internal/cacheUtils.ts b/src/internal/cacheUtils.ts index 9c1035a..f2eb436 100644 --- a/src/internal/cacheUtils.ts +++ b/src/internal/cacheUtils.ts @@ -52,7 +52,12 @@ export async function resolvePaths(patterns: string[]): Promise { .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 From b9f1d7d9ae51b0db1cab529d44db028f0af34feb Mon Sep 17 00:00:00 2001 From: Lovepreet Singh Date: Wed, 13 Jul 2022 11:55:36 +0000 Subject: [PATCH 2/7] Fix testcase for resolvePaths works on current directory --- __tests__/cacheUtils.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__tests__/cacheUtils.test.ts b/__tests__/cacheUtils.test.ts index c5817f2..5048651 100644 --- a/__tests__/cacheUtils.test.ts +++ b/__tests__/cacheUtils.test.ts @@ -35,5 +35,5 @@ test('assertDefined returns value', () => { test('resolvePaths works on current directory', async () => { const resolvedPath = await cacheUtils.resolvePaths(['.']) - expect(resolvedPath).toBe(['.']) + expect(resolvedPath).toStrictEqual(['.']) }) From 34526e53bb766167904b5542f0e3d556424cd22c Mon Sep 17 00:00:00 2001 From: Lovepreet Singh Date: Wed, 13 Jul 2022 13:37:49 +0000 Subject: [PATCH 3/7] Fix linting for changes --- src/internal/cacheUtils.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/internal/cacheUtils.ts b/src/internal/cacheUtils.ts index f2eb436..c2ace52 100644 --- a/src/internal/cacheUtils.ts +++ b/src/internal/cacheUtils.ts @@ -52,9 +52,9 @@ export async function resolvePaths(patterns: string[]): Promise { .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. - if (relativeFile === "") { + if (relativeFile === '') { // path.relative returns empty string if workspace and file are equal - paths.push(".") + paths.push('.') } else { paths.push(`${relativeFile}`) } From 52d520bfd0b659533b3664b1f51e6b0b327c6476 Mon Sep 17 00:00:00 2001 From: Lovepreet Singh Date: Thu, 14 Jul 2022 07:50:44 +0000 Subject: [PATCH 4/7] Fix failing resolvePaths testcase --- __tests__/cacheUtils.test.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/__tests__/cacheUtils.test.ts b/__tests__/cacheUtils.test.ts index 5048651..1cd641f 100644 --- a/__tests__/cacheUtils.test.ts +++ b/__tests__/cacheUtils.test.ts @@ -1,5 +1,6 @@ import {promises as fs} from 'fs' import * as path from 'path' +import { coerce } from 'semver' import * as cacheUtils from '../src/internal/cacheUtils' test('getArchiveFileSizeInBytes returns file size', () => { @@ -34,6 +35,6 @@ test('assertDefined returns value', () => { }) test('resolvePaths works on current directory', async () => { - const resolvedPath = await cacheUtils.resolvePaths(['.']) - expect(resolvedPath).toStrictEqual(['.']) + const paths = await cacheUtils.resolvePaths(['.']) + expect(paths).toContain('.') }) From 7f3dae6795adf6aaf809958d6275107b1eeeb0b7 Mon Sep 17 00:00:00 2001 From: Lovepreet Singh Date: Thu, 14 Jul 2022 07:50:44 +0000 Subject: [PATCH 5/7] Fix failing resolvePaths testcase --- __tests__/cacheUtils.test.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/__tests__/cacheUtils.test.ts b/__tests__/cacheUtils.test.ts index 5048651..1cd641f 100644 --- a/__tests__/cacheUtils.test.ts +++ b/__tests__/cacheUtils.test.ts @@ -1,5 +1,6 @@ import {promises as fs} from 'fs' import * as path from 'path' +import { coerce } from 'semver' import * as cacheUtils from '../src/internal/cacheUtils' test('getArchiveFileSizeInBytes returns file size', () => { @@ -34,6 +35,6 @@ test('assertDefined returns value', () => { }) test('resolvePaths works on current directory', async () => { - const resolvedPath = await cacheUtils.resolvePaths(['.']) - expect(resolvedPath).toStrictEqual(['.']) + const paths = await cacheUtils.resolvePaths(['.']) + expect(paths).toContain('.') }) From 1491e8feaf339541721278775b390554afcd1a29 Mon Sep 17 00:00:00 2001 From: Lovepreet Singh Date: Thu, 14 Jul 2022 08:18:09 +0000 Subject: [PATCH 6/7] Remove unnecessary import --- __tests__/cacheUtils.test.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/__tests__/cacheUtils.test.ts b/__tests__/cacheUtils.test.ts index edf36b1..f417791 100644 --- a/__tests__/cacheUtils.test.ts +++ b/__tests__/cacheUtils.test.ts @@ -1,6 +1,5 @@ import {promises as fs} from 'fs' import * as path from 'path' -import { coerce } from 'semver' import * as cacheUtils from '../src/internal/cacheUtils' test('getArchiveFileSizeInBytes returns file size', () => { From dc711a28f2f1c507ef0fe07b2cfdcc49ed937053 Mon Sep 17 00:00:00 2001 From: Lovepreet Singh Date: Wed, 20 Jul 2022 05:25:47 +0000 Subject: [PATCH 7/7] Change testcase to test against github workspace directory instead of current directory --- __tests__/cacheUtils.test.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/__tests__/cacheUtils.test.ts b/__tests__/cacheUtils.test.ts index f417791..25124b4 100644 --- a/__tests__/cacheUtils.test.ts +++ b/__tests__/cacheUtils.test.ts @@ -33,7 +33,8 @@ test('assertDefined returns value', () => { expect(cacheUtils.assertDefined('test', 5)).toBe(5) }) -test('resolvePaths works on current directory', async () => { - const paths = await cacheUtils.resolvePaths(['.']) - expect(paths.length).toBe(1) +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) })