saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

The toolchain is not cached. Always install it on Linux.

Browse source 
Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
This commit is contained in:
Pedro Algarvio 2022-12-22 18:54:12 +00:00 • committed by Pedro Algarvio
parent 90bca1a7f9
commit c683d766bd
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
noxfile.py
View file

@ -69,6 +69,7 @@ if COVERAGE_FILE is None:
IS_DARWIN = sys.platform.lower().startswith("darwin")
IS_WINDOWS = sys.platform.lower().startswith("win")
IS_FREEBSD = sys.platform.lower().startswith("freebsd")
IS_LINUX = sys.platform.lower().startswith("linux")
ONEDIR_ARTIFACT_PATH = ARTIFACTS_DIR / "salt"
if IS_WINDOWS:
ONEDIR_PYTHON_PATH = ONEDIR_ARTIFACT_PATH / "Scripts" / "python.exe"
@ -314,12 +315,12 @@ def _install_requirements(
requirements_type="ci",
onedir=False,
):
if onedir and IS_LINUX:
session_run_always(session, "python3", "-m", "relenv", "toolchain", "fetch")
if not _upgrade_pip_setuptools_and_wheel(session):
return False
if onedir and not IS_WINDOWS and not IS_DARWIN and not IS_FREEBSD:
session_run_always(session, "python3", "-m", "relenv", "toolchain", "fetch")
# Install requirements
requirements_file = _get_pip_requirements_file(
session, transport, requirements_type=requirements_type