@@ -34467,8 +34467,9 @@ const path = __importStar(__webpack_require__(622));
3446734467const os_1 = __importDefault(__webpack_require__(87));
3446834468const cache_distributor_1 = __importDefault(__webpack_require__(435));
3446934469class PipCache extends cache_distributor_1.default {
34470- constructor(cacheDependencyPath = '**/requirements.txt') {
34470+ constructor(pythonVersion, cacheDependencyPath = '**/requirements.txt') {
3447134471 super('pip', cacheDependencyPath);
34472+ this.pythonVersion = pythonVersion;
3447234473 }
3447334474 getCacheGlobalDirectories() {
3447434475 return __awaiter(this, void 0, void 0, function* () {
@@ -34487,8 +34488,8 @@ class PipCache extends cache_distributor_1.default {
3448734488 computeKeys() {
3448834489 return __awaiter(this, void 0, void 0, function* () {
3448934490 const hash = yield glob.hashFiles(this.cacheDependencyPath);
34490- const primaryKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${this.packageManager}-${hash}`;
34491- const restoreKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${this.packageManager}`;
34491+ const primaryKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-python-${this.pythonVersion}- ${this.packageManager}-${hash}`;
34492+ const restoreKey = `${this.CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-python-${this.pythonVersion}- ${this.packageManager}`;
3449234493 return {
3449334494 primaryKey,
3449434495 restoreKey: [restoreKey]
@@ -43888,7 +43889,7 @@ var PackageManagers;
4388843889function getCacheDistributor(packageManager, pythonVersion, cacheDependencyPath) {
4388943890 switch (packageManager) {
4389043891 case PackageManagers.Pip:
43891- return new pip_cache_1.default(cacheDependencyPath);
43892+ return new pip_cache_1.default(pythonVersion, cacheDependencyPath);
4389243893 case PackageManagers.Pipenv:
4389343894 return new pipenv_cache_1.default(pythonVersion, cacheDependencyPath);
4389443895 default:
0 commit comments