actions/setup-dotnet
1
0
Fork 0
mirror of https://github.com/actions/setup-dotnet.git synced 2024-11-22 19:41:08 +07:00
Code Issues Packages Projects Releases Wiki Activity

feat: add arch to cache key

Browse Source
This commit is contained in:
Zxilly 2024-09-08 10:32:41 +00:00 committed by GitHub
parent 6bd8b7f777
commit 4cd5bdca49
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); 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( expect(jest.mocked(core.saveState)).toHaveBeenCalledWith(
'CACHE_KEY', 'CACHE_KEY',
expectedKey expectedKey
@ -66,7 +66,7 @@ describe('cache-restore tests', () => {
}); });
it('calls core.saveState("CACHE_RESULT") when cache.restoreCache() returns key', async () => { 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(glob.hashFiles).mockResolvedValue('hash');
jest.mocked(cache.restoreCache).mockResolvedValue(expectedKey); jest.mocked(cache.restoreCache).mockResolvedValue(expectedKey);

3
dist/setup/index.js vendored
View File

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