Skip to content

Commit c4a742c

Browse files
authored
fix(): cache resolve version input (#267)
1 parent f556e5b commit c4a742c

File tree

4 files changed

+20
-8
lines changed

4 files changed

+20
-8
lines changed

__tests__/cache-restore.test.ts

+16-3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ describe('restoreCache', () => {
1717
let infoSpy = jest.spyOn(core, 'info');
1818
let setOutputSpy = jest.spyOn(core, 'setOutput');
1919

20+
const versionSpec = '1.13.1';
2021
const packageManager = 'default';
2122
const cacheDependencyPath = 'path';
2223

@@ -40,7 +41,11 @@ describe('restoreCache', () => {
4041

4142
//Act + Assert
4243
expect(async () => {
43-
await cacheRestore.restoreCache(packageManager, cacheDependencyPath);
44+
await cacheRestore.restoreCache(
45+
versionSpec,
46+
packageManager,
47+
cacheDependencyPath
48+
);
4449
}).rejects.toThrowError(
4550
'Some specified paths were not resolved, unable to cache dependencies.'
4651
);
@@ -61,7 +66,11 @@ describe('restoreCache', () => {
6166
});
6267

6368
//Act + Assert
64-
await cacheRestore.restoreCache(packageManager, cacheDependencyPath);
69+
await cacheRestore.restoreCache(
70+
versionSpec,
71+
packageManager,
72+
cacheDependencyPath
73+
);
6574
expect(infoSpy).toBeCalledWith(`Cache is not found`);
6675
});
6776

@@ -80,7 +89,11 @@ describe('restoreCache', () => {
8089
});
8190

8291
//Act + Assert
83-
await cacheRestore.restoreCache(packageManager, cacheDependencyPath);
92+
await cacheRestore.restoreCache(
93+
versionSpec,
94+
packageManager,
95+
cacheDependencyPath
96+
);
8497
expect(setOutputSpy).toBeCalledWith('cache-hit', true);
8598
});
8699
});

dist/setup/index.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -63032,10 +63032,9 @@ const path_1 = __importDefault(__nccwpck_require__(1017));
6303263032
const fs_1 = __importDefault(__nccwpck_require__(7147));
6303363033
const constants_1 = __nccwpck_require__(9042);
6303463034
const cache_utils_1 = __nccwpck_require__(1678);
63035-
exports.restoreCache = (packageManager, cacheDependencyPath) => __awaiter(void 0, void 0, void 0, function* () {
63035+
exports.restoreCache = (versionSpec, packageManager, cacheDependencyPath) => __awaiter(void 0, void 0, void 0, function* () {
6303663036
const packageManagerInfo = yield cache_utils_1.getPackageManagerInfo(packageManager);
6303763037
const platform = process.env.RUNNER_OS;
63038-
const versionSpec = core.getInput('go-version');
6303963038
const cachePaths = yield cache_utils_1.getCacheDirectoryPath(packageManagerInfo);
6304063039
const dependencyFilePath = cacheDependencyPath
6304163040
? cacheDependencyPath
@@ -63538,7 +63537,7 @@ function run() {
6353863537
if (cache && cache_utils_1.isCacheFeatureAvailable()) {
6353963538
const packageManager = 'default';
6354063539
const cacheDependencyPath = core.getInput('cache-dependency-path');
63541-
yield cache_restore_1.restoreCache(packageManager, cacheDependencyPath);
63540+
yield cache_restore_1.restoreCache(versionSpec, packageManager, cacheDependencyPath);
6354263541
}
6354363542
// add problem matchers
6354463543
const matchersPath = path_1.default.join(__dirname, '../..', 'matchers.json');

src/cache-restore.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import {PackageManagerInfo} from './package-managers';
99
import {getCacheDirectoryPath, getPackageManagerInfo} from './cache-utils';
1010

1111
export const restoreCache = async (
12+
versionSpec: string,
1213
packageManager: string,
1314
cacheDependencyPath?: string
1415
) => {
1516
const packageManagerInfo = await getPackageManagerInfo(packageManager);
1617
const platform = process.env.RUNNER_OS;
17-
const versionSpec = core.getInput('go-version');
1818

1919
const cachePaths = await getCacheDirectoryPath(packageManagerInfo);
2020

src/main.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export async function run() {
5656
if (cache && isCacheFeatureAvailable()) {
5757
const packageManager = 'default';
5858
const cacheDependencyPath = core.getInput('cache-dependency-path');
59-
await restoreCache(packageManager, cacheDependencyPath);
59+
await restoreCache(versionSpec, packageManager, cacheDependencyPath);
6060
}
6161

6262
// add problem matchers

0 commit comments

Comments
 (0)