Author: ivan
Date: Thu Jul 2 12:19:49 2026
New Revision: 1935805
Log:
On 1.15.x: Merge r1935588, r1935597 and r1935637 from trunk:
gha: Configure CMake to use to explicitly specified Python version.
Justification:
Keep GitHub Actions configuration in sync with trunk.
Votes:
+1: ivan (only affects GHA)
Modified:
subversion/branches/1.15.x/ (props changed)
subversion/branches/1.15.x/.github/workflows/cmake.yml
Modified: subversion/branches/1.15.x/.github/workflows/cmake.yml
==============================================================================
--- subversion/branches/1.15.x/.github/workflows/cmake.yml Thu Jul 2
11:55:08 2026 (r1935804)
+++ subversion/branches/1.15.x/.github/workflows/cmake.yml Thu Jul 2
12:19:49 2026 (r1935805)
@@ -190,6 +190,12 @@ jobs:
Join-String -Separator ':'
"PKG_CONFIG_PATH=$PKG_CONFIG_PATH" >> $env:GITHUB_ENV
+ - name: Set platform-specific values
+ id: platform
+ run: |
+ $PYTHON_ROOT=$(python -c 'import pathlib, sys;
print(str(pathlib.Path(sys.executable).resolve().parent.parent))')
+ "python_root=$PYTHON_ROOT" >> "$env:GITHUB_OUTPUT"
+
- name: Use LF for Git checkout
run: |
git config --global core.autocrlf false
@@ -209,6 +215,10 @@ jobs:
-DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/installdir
-DVCPKG_TARGET_TRIPLET=${{ matrix.vcpkg_triplet }}
-DSVN_TEST_CONFIGURE_FOR_PARALLEL=ON
+ -DPython3_ROOT_DIR="${{ steps.platform.outputs.python_root }}"
+ -DPython3_FIND_REGISTRY=NEVER
+ -DPython3_FIND_STRATEGY=LOCATION
+ -DPython3_FIND_UNVERSIONED_NAMES=FIRST
${{ matrix.extra_config_opts }}
- name: Build CMake
