@@ -95972,6 +95972,7 @@ function binDir(installDir) {
95972
95972
}
95973
95973
}
95974
95974
<<<<<<< HEAD
95975
+ <<<<<<< HEAD
95975
95976
async function useCpythonVersion(version, architecture, updateEnvironment, checkLatest, allowPreReleases, freethreaded) {
95976
95977
let manifest = null;
95977
95978
const { version: desugaredVersionSpec, freethreaded: versionFreethreaded } = desugarVersion(version);
@@ -95993,6 +95994,8 @@ async function useCpythonVersion(version, architecture, updateEnvironment, check
95993
95994
semanticVersionSpec = resolvedVersion;
95994
95995
core.info(`Resolved as '${semanticVersionSpec}'`);
95995
95996
=======
95997
+ =======
95998
+ >>>>>>> be8146b (check failures fix)
95996
95999
function installPip(pythonLocation) {
95997
96000
return __awaiter(this, void 0, void 0, function* () {
95998
96001
const pipVersion = core.getInput('pip-version');
@@ -96016,7 +96019,32 @@ function useCpythonVersion(version, architecture, updateEnvironment, checkLatest
96016
96019
if (versionFreethreaded) {
96017
96020
// Use the freethreaded version if it was specified in the input, e.g., 3.13t
96018
96021
freethreaded = true;
96022
+ <<<<<<< HEAD
96019
96023
>>>>>>> e9c40fb (Add support for `pip-version` (#1129))
96024
+ =======
96025
+ =======
96026
+ async function useCpythonVersion(version, architecture, updateEnvironment, checkLatest, allowPreReleases, freethreaded) {
96027
+ let manifest = null;
96028
+ const { version: desugaredVersionSpec, freethreaded: versionFreethreaded } = desugarVersion(version);
96029
+ let semanticVersionSpec = pythonVersionToSemantic(desugaredVersionSpec, allowPreReleases);
96030
+ if (versionFreethreaded) {
96031
+ // Use the freethreaded version if it was specified in the input, e.g., 3.13t
96032
+ freethreaded = true;
96033
+ }
96034
+ core.debug(`Semantic version spec of ${version} is ${semanticVersionSpec}`);
96035
+ if (freethreaded) {
96036
+ // Free threaded versions use an architecture suffix like `x64-freethreaded`
96037
+ core.debug(`Using freethreaded version of ${semanticVersionSpec}`);
96038
+ architecture += '-freethreaded';
96039
+ }
96040
+ if (checkLatest) {
96041
+ manifest = await installer.getManifest();
96042
+ const resolvedVersion = (await installer.findReleaseFromManifest(semanticVersionSpec, architecture, manifest))?.version;
96043
+ if (resolvedVersion) {
96044
+ semanticVersionSpec = resolvedVersion;
96045
+ core.info(`Resolved as '${semanticVersionSpec}'`);
96046
+ >>>>>>> 34f8914 (check failures fix)
96047
+ >>>>>>> be8146b (check failures fix)
96020
96048
}
96021
96049
else {
96022
96050
core.info(`Failed to resolve version ${semanticVersionSpec} from manifest`);
@@ -96080,6 +96108,7 @@ function useCpythonVersion(version, architecture, updateEnvironment, checkLatest
96080
96108
const userScriptsDir = path.join(process.env['APPDATA'] || '', 'Python', `Python${major}${minor}`, 'Scripts');
96081
96109
core.addPath(userScriptsDir);
96082
96110
}
96111
+ <<<<<<< HEAD
96083
96112
<<<<<<< HEAD
96084
96113
// On Linux and macOS, pip will create the --user directory and add it to PATH as needed.
96085
96114
}
@@ -96093,6 +96122,8 @@ function useCpythonVersion(version, architecture, updateEnvironment, checkLatest
96093
96122
core.setOutput('python-path', pythonPath);
96094
96123
return { impl: 'CPython', version: pythonVersion };
96095
96124
=======
96125
+ =======
96126
+ >>>>>>> be8146b (check failures fix)
96096
96127
if (!installDir) {
96097
96128
const osInfo = yield (0, utils_1.getOSInfo)();
96098
96129
const msg = [
@@ -96176,7 +96207,23 @@ function useCpythonVersion(version, architecture, updateEnvironment, checkLatest
96176
96207
yield installPip(binaryPath);
96177
96208
return { impl: 'CPython', version: pythonVersion };
96178
96209
});
96210
+ <<<<<<< HEAD
96179
96211
>>>>>>> e9c40fb (Add support for `pip-version` (#1129))
96212
+ =======
96213
+ =======
96214
+ // On Linux and macOS, pip will create the --user directory and add it to PATH as needed.
96215
+ }
96216
+ const installed = versionFromPath(installDir);
96217
+ let pythonVersion = installed;
96218
+ if (freethreaded) {
96219
+ // Add the freethreaded suffix to the version (e.g., 3.13.1t)
96220
+ pythonVersion += 't';
96221
+ }
96222
+ core.setOutput('python-version', pythonVersion);
96223
+ core.setOutput('python-path', pythonPath);
96224
+ return { impl: 'CPython', version: pythonVersion };
96225
+ >>>>>>> 34f8914 (check failures fix)
96226
+ >>>>>>> be8146b (check failures fix)
96180
96227
}
96181
96228
/* Desugar free threaded and dev versions */
96182
96229
function desugarVersion(versionSpec) {
@@ -96890,11 +96937,14 @@ function isGraalPyVersion(versionSpec) {
96890
96937
return versionSpec.startsWith('graalpy');
96891
96938
}
96892
96939
<<<<<<< HEAD
96940
+ <<<<<<< HEAD
96893
96941
async function cacheDependencies(cache, pythonVersion) {
96894
96942
const cacheDependencyPath = core.getInput('cache-dependency-path') || undefined;
96895
96943
const cacheDistributor = (0, cache_factory_1.getCacheDistributor)(cache, pythonVersion, cacheDependencyPath);
96896
96944
await cacheDistributor.restoreCache();
96897
96945
=======
96946
+ =======
96947
+ >>>>>>> be8146b (check failures fix)
96898
96948
function cacheDependencies(cache, pythonVersion) {
96899
96949
return __awaiter(this, void 0, void 0, function* () {
96900
96950
const cacheDependencyPath = core.getInput('cache-dependency-path') || undefined;
@@ -96940,7 +96990,16 @@ function cacheDependencies(cache, pythonVersion) {
96940
96990
const cacheDistributor = (0, cache_factory_1.getCacheDistributor)(cache, pythonVersion, dependencyPathForCache);
96941
96991
yield cacheDistributor.restoreCache();
96942
96992
});
96993
+ <<<<<<< HEAD
96943
96994
>>>>>>> 1264885 (Enhance cache-dependency-path handling to support files outside the workspace root (#1128))
96995
+ =======
96996
+ =======
96997
+ async function cacheDependencies(cache, pythonVersion) {
96998
+ const cacheDependencyPath = core.getInput('cache-dependency-path') || undefined;
96999
+ const cacheDistributor = (0, cache_factory_1.getCacheDistributor)(cache, pythonVersion, cacheDependencyPath);
97000
+ await cacheDistributor.restoreCache();
97001
+ >>>>>>> 34f8914 (check failures fix)
97002
+ >>>>>>> be8146b (check failures fix)
96944
97003
}
96945
97004
exports.cacheDependencies = cacheDependencies;
96946
97005
function resolveVersionInputFromDefaultFile() {
0 commit comments