actions/setup-dotnet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 8f55f6c3bee459ab5a2d729f9c8602c2327a624c into dbebe359e495844f078430a9de2b64d21656c21a

Browse Source
This commit is contained in:
Zxilly 2024-08-05 16:26:34 -05:00 committed by GitHub
commit 7093a969f7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
__tests__/cache-restore.test.ts
View File

@ -50,7 +50,7 @@ describe('cache-restore tests', () => {
await restoreCache(lockFilePattern);
const expectedKey = `dotnet-cache-${process.env.RUNNER_OS}-hash`;
const expectedKey = `dotnet-cache-${process.env.RUNNER_OS}-${process.arch}-hash`;
expect(jest.mocked(core.saveState)).toHaveBeenCalledWith(
'CACHE_KEY',
expectedKey
@ -66,7 +66,7 @@ describe('cache-restore tests', () => {
});
it('calls core.saveState("CACHE_RESULT") when cache.restoreCache() returns key', async () => {
const expectedKey = `dotnet-cache-${process.env.RUNNER_OS}-hash`;
const expectedKey = `dotnet-cache-${process.env.RUNNER_OS}-${process.arch}-hash`;
jest.mocked(glob.hashFiles).mockResolvedValue('hash');
jest.mocked(cache.restoreCache).mockResolvedValue(expectedKey);

3
dist/setup/index.js vendored
View File

@ -93500,7 +93500,8 @@ const restoreCache = (cacheDependencyPath) => __awaiter(void 0, void 0, void 0,
throw new Error('Some specified paths were not resolved, unable to cache dependencies.');
}
const platform = process.env.RUNNER_OS;
const primaryKey = `dotnet-cache-${platform}-${fileHash}`;
const arch = process.arch;
const primaryKey = `dotnet-cache-${platform}-${arch}-${fileHash}`;
core.debug(`primary key is ${primaryKey}`);
core.saveState(constants_1.State.CachePrimaryKey, primaryKey);
const { 'global-packages': cachePath } = yield (0, cache_utils_1.getNuGetFolderPath)();

3
src/cache-restore.ts
View File

@ -17,7 +17,8 @@ export const restoreCache = async (cacheDependencyPath?: string) => {
}
const platform = process.env.RUNNER_OS;
const primaryKey = `dotnet-cache-${platform}-${fileHash}`;
const arch = process.arch;
const primaryKey = `dotnet-cache-${platform}-${arch}-${fileHash}`;
core.debug(`primary key is ${primaryKey}`);
core.saveState(State.CachePrimaryKey, primaryKey);