diff --git a/.github/workflows/Windows_build.yml b/.github/workflows/Windows_build.yml index 3622da815..3604b34a6 100644 --- a/.github/workflows/Windows_build.yml +++ b/.github/workflows/Windows_build.yml @@ -55,6 +55,10 @@ jobs: POWERSHELL_TELEMETRY_OPTOUT: 1 steps: - uses: actions/checkout@main + # TODO: Remove this once the default Python is upgraded from 3.9: https://github.com/actions/runner-images/blob/main/images/windows/Windows2025-Readme.md#language-and-runtime + - uses: actions/setup-python@main + with: + python-version: '3.x' - name: Lint run: python xenia-build.py lint --all @@ -70,6 +74,10 @@ jobs: fetch-depth: 0 - name: Setup run: git submodule update --init --depth=1 -j $env:NUMBER_OF_PROCESSORS (Select-String -CaseSensitive '(?<=path = )(?!third_party\/(FidelityFX-(CAS|FSR)|premake-(androidndk|cmake|export-compile-commands))).+' .gitmodules).Matches.Value + # TODO: Remove this once the default Python is upgraded from 3.9: https://github.com/actions/runner-images/blob/main/images/windows/Windows2025-Readme.md#language-and-runtime + - uses: actions/setup-python@main + with: + python-version: '3.x' - name: Build run: python xenia-build.py build --config=Release --target=src\xenia-app - name: Prepare artifacts diff --git a/docs/building.md b/docs/building.md index 05eaff6f1..b37702867 100644 --- a/docs/building.md +++ b/docs/building.md @@ -12,7 +12,7 @@ drivers. * [Visual Studio 2022](https://www.visualstudio.com/downloads/) * CMake 3.10+ (or C++ CMake tools for Windows) * Windows 11 SDK version 10.0.22000.0 (for Visual Studio 2022, this or any newer version) -* [Python 3.9+ 64-bit](https://www.python.org/downloads/) +* [Python 3.10+ 64-bit](https://www.python.org/downloads/) * Ensure Python is in PATH. ``` diff --git a/xb.bat b/xb.bat index 8b7646fd2..fb1ac2895 100644 --- a/xb.bat +++ b/xb.bat @@ -10,7 +10,7 @@ REM ============================================================================ CALL :check_python IF %_RESULT% NEQ 0 ( ECHO. - ECHO Python 3.9+ must be installed and on PATH: + ECHO Python 3.10+ must be installed and on PATH: ECHO https://www.python.org/ GOTO :eof ) diff --git a/xb.ps1 b/xb.ps1 index 6b5e69094..73f95411d 100644 --- a/xb.ps1 +++ b/xb.ps1 @@ -9,7 +9,7 @@ foreach ($pythonExecutable in $pythonExecutables) { } # Neither found, error and exit if (!$pythonPath) { - Throw "ERROR: Python 3.9+ 64-bit must be installed and on PATH:`nhttps://www.python.org/" + Throw "ERROR: Python 3.10+ 64-bit must be installed and on PATH:`nhttps://www.python.org/" } & $pythonPath "$($PSScriptRoot)/xenia-build.py" $args diff --git a/xenia-build.py b/xenia-build.py index 644a037c4..85189a690 100755 --- a/xenia-build.py +++ b/xenia-build.py @@ -151,7 +151,7 @@ def main(): print("WARNING: The source tree is unversioned. Version info will be omitted from all binaries!\n") # Check python version. - python_minimum_ver = 3,9 + python_minimum_ver = 3,10 if not sys.version_info[:2] >= (python_minimum_ver[0], python_minimum_ver[1]) or not sys.maxsize > 2**32: print(f"ERROR: Python {python_minimum_ver[0]}.{python_minimum_ver[1]}+ 64-bit must be installed and on PATH") sys.exit(1) @@ -420,10 +420,10 @@ def get_pr_number(): Returns the pull request number if the workflow is triggered by a PR, otherwise None. """ github_ref = os.getenv('GITHUB_REF') - + if github_ref and github_ref.startswith('refs/pull/'): return github_ref.split('/')[2] - + def git_submodule_update(): """Runs a git submodule init and update. """