@@ -34467,8 +34467,9 @@ const path = __importStar(__webpack_require__(622));
34467
34467
const os_1 = __importDefault(__webpack_require__(87));
34468
34468
const cache_distributor_1 = __importDefault(__webpack_require__(435));
34469
34469
class PipCache extends cache_distributor_1.default {
34470
- constructor(cacheDependencyPath = '**/requirements.txt') {
34470
+ constructor(pythonVersion, cacheDependencyPath = '**/requirements.txt') {
34471
34471
super('pip', cacheDependencyPath);
34472
+ this.pythonVersion = pythonVersion;
34472
34473
}
34473
34474
getCacheGlobalDirectories() {
34474
34475
return __awaiter(this, void 0, void 0, function* () {
@@ -34487,8 +34488,8 @@ class PipCache extends cache_distributor_1.default {
34487
34488
computeKeys() {
34488
34489
return __awaiter(this, void 0, void 0, function* () {
34489
34490
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}`;
34492
34493
return {
34493
34494
primaryKey,
34494
34495
restoreKey: [restoreKey]
@@ -43888,7 +43889,7 @@ var PackageManagers;
43888
43889
function getCacheDistributor(packageManager, pythonVersion, cacheDependencyPath) {
43889
43890
switch (packageManager) {
43890
43891
case PackageManagers.Pip:
43891
- return new pip_cache_1.default(cacheDependencyPath);
43892
+ return new pip_cache_1.default(pythonVersion, cacheDependencyPath);
43892
43893
case PackageManagers.Pipenv:
43893
43894
return new pipenv_cache_1.default(pythonVersion, cacheDependencyPath);
43894
43895
default:
0 commit comments