Skip to content

Commit 5f639eb

Browse files
check failures fix
1 parent 822c528 commit 5f639eb

File tree

1 file changed

+59
-0
lines changed

1 file changed

+59
-0
lines changed

dist/setup/index.js

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95972,6 +95972,7 @@ function binDir(installDir) {
9597295972
}
9597395973
}
9597495974
<<<<<<< HEAD
95975+
<<<<<<< HEAD
9597595976
async function useCpythonVersion(version, architecture, updateEnvironment, checkLatest, allowPreReleases, freethreaded) {
9597695977
let manifest = null;
9597795978
const { version: desugaredVersionSpec, freethreaded: versionFreethreaded } = desugarVersion(version);
@@ -95993,6 +95994,8 @@ async function useCpythonVersion(version, architecture, updateEnvironment, check
9599395994
semanticVersionSpec = resolvedVersion;
9599495995
core.info(`Resolved as '${semanticVersionSpec}'`);
9599595996
=======
95997+
=======
95998+
>>>>>>> be8146b (check failures fix)
9599695999
function installPip(pythonLocation) {
9599796000
return __awaiter(this, void 0, void 0, function* () {
9599896001
const pipVersion = core.getInput('pip-version');
@@ -96016,7 +96019,32 @@ function useCpythonVersion(version, architecture, updateEnvironment, checkLatest
9601696019
if (versionFreethreaded) {
9601796020
// Use the freethreaded version if it was specified in the input, e.g., 3.13t
9601896021
freethreaded = true;
96022+
<<<<<<< HEAD
9601996023
>>>>>>> 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)
9602096048
}
9602196049
else {
9602296050
core.info(`Failed to resolve version ${semanticVersionSpec} from manifest`);
@@ -96080,6 +96108,7 @@ function useCpythonVersion(version, architecture, updateEnvironment, checkLatest
9608096108
const userScriptsDir = path.join(process.env['APPDATA'] || '', 'Python', `Python${major}${minor}`, 'Scripts');
9608196109
core.addPath(userScriptsDir);
9608296110
}
96111+
<<<<<<< HEAD
9608396112
<<<<<<< HEAD
9608496113
// On Linux and macOS, pip will create the --user directory and add it to PATH as needed.
9608596114
}
@@ -96093,6 +96122,8 @@ function useCpythonVersion(version, architecture, updateEnvironment, checkLatest
9609396122
core.setOutput('python-path', pythonPath);
9609496123
return { impl: 'CPython', version: pythonVersion };
9609596124
=======
96125+
=======
96126+
>>>>>>> be8146b (check failures fix)
9609696127
if (!installDir) {
9609796128
const osInfo = yield (0, utils_1.getOSInfo)();
9609896129
const msg = [
@@ -96176,7 +96207,23 @@ function useCpythonVersion(version, architecture, updateEnvironment, checkLatest
9617696207
yield installPip(binaryPath);
9617796208
return { impl: 'CPython', version: pythonVersion };
9617896209
});
96210+
<<<<<<< HEAD
9617996211
>>>>>>> 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)
9618096227
}
9618196228
/* Desugar free threaded and dev versions */
9618296229
function desugarVersion(versionSpec) {
@@ -96890,11 +96937,14 @@ function isGraalPyVersion(versionSpec) {
9689096937
return versionSpec.startsWith('graalpy');
9689196938
}
9689296939
<<<<<<< HEAD
96940+
<<<<<<< HEAD
9689396941
async function cacheDependencies(cache, pythonVersion) {
9689496942
const cacheDependencyPath = core.getInput('cache-dependency-path') || undefined;
9689596943
const cacheDistributor = (0, cache_factory_1.getCacheDistributor)(cache, pythonVersion, cacheDependencyPath);
9689696944
await cacheDistributor.restoreCache();
9689796945
=======
96946+
=======
96947+
>>>>>>> be8146b (check failures fix)
9689896948
function cacheDependencies(cache, pythonVersion) {
9689996949
return __awaiter(this, void 0, void 0, function* () {
9690096950
const cacheDependencyPath = core.getInput('cache-dependency-path') || undefined;
@@ -96940,7 +96990,16 @@ function cacheDependencies(cache, pythonVersion) {
9694096990
const cacheDistributor = (0, cache_factory_1.getCacheDistributor)(cache, pythonVersion, dependencyPathForCache);
9694196991
yield cacheDistributor.restoreCache();
9694296992
});
96993+
<<<<<<< HEAD
9694396994
>>>>>>> 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)
9694497003
}
9694597004
exports.cacheDependencies = cacheDependencies;
9694697005
function resolveVersionInputFromDefaultFile() {

0 commit comments

Comments
 (0)