本地工具路径DTU_*环境变量改造落地：10处调用点去硬编码+变量优先解析，本机全链路验证通过，文档同步收口，requirements补pre-commit
This commit is contained in:
+122
-45
@@ -49,6 +49,11 @@
|
||||
# Python 3.x、cppcheck、pre-commit、MSVC（VS2019/2022 的 C++ 工具链 + Windows SDK）
|
||||
# - 缺 MSVC 时 L0.5 步骤会**降级为提示并跳过**（不硬失败），但会打印醒目 WARNING
|
||||
#
|
||||
# 🔧 runner 机器级环境变量（可选项覆盖；runner 以 SYSTEM 服务运行，用户级变量不可见）：
|
||||
# DTU_PRECOMMIT_PYTHON / DTU_CPPCHECK / DTU_MSVC_CL —— 未设置时按 PATH / 标准 VS 布局自动发现。
|
||||
# 变量显式设置但值无效时 job 直接报变量名并失败（不静默回退）。配置方法见
|
||||
# docs/环境与部署/本地工具路径环境变量方案.md §5.3。
|
||||
#
|
||||
# 本地等价命令（与 CI 同一套判定，见 scripts/ci_local.py）：
|
||||
# & '.venv\Scripts\python.exe' scripts/ci_local.py
|
||||
|
||||
@@ -96,9 +101,10 @@ jobs:
|
||||
|
||||
# --- pick a Python that actually has pre-commit -------------------
|
||||
# The runner runs as SYSTEM, whose PATH is NOT the dev user's PATH.
|
||||
# On this box SYSTEM's `python` is C:\msys64\...\python.exe (3.14.5,
|
||||
# no pre-commit). Probe the same order as scripts/ci_local.py:
|
||||
# PATH python -> .venv -> anaconda3
|
||||
# Probe order per the DTU_* env var plan (kept in sync with
|
||||
# scripts/ci_local.py):
|
||||
# DTU_PRECOMMIT_PYTHON (explicit; invalid value = hard error)
|
||||
# -> PATH python -> repo .venv
|
||||
#
|
||||
# CAUTION 1: a failing native command writes to stderr; with
|
||||
# $ErrorActionPreference='Stop' that would abort the whole script
|
||||
@@ -110,27 +116,46 @@ jobs:
|
||||
# see at all -- no python.exe path can help then. Probe with `-s`
|
||||
# (no user-site) so we only accept an interpreter that works for
|
||||
# SYSTEM, and say so clearly when none is found.
|
||||
$candidates = @(
|
||||
(Get-Command python -ErrorAction SilentlyContinue | Select-Object -ExpandProperty Source),
|
||||
(Join-Path $repoRoot '.venv\Scripts\python.exe'),
|
||||
'C:\ProgramData\anaconda3\python.exe'
|
||||
)
|
||||
$py = $null
|
||||
$saved = $ErrorActionPreference
|
||||
foreach ($c in $candidates) {
|
||||
if (-not $c) { continue }
|
||||
if (-not (Test-Path $c)) { continue }
|
||||
$envPy = $env:DTU_PRECOMMIT_PYTHON
|
||||
if ($envPy) {
|
||||
if (-not (Test-Path $envPy)) {
|
||||
$ErrorActionPreference = 'Stop'
|
||||
Write-Host "::error::DTU_PRECOMMIT_PYTHON is set but does not exist: $envPy"
|
||||
Write-Host "::error::fix the variable (full path to a python.exe with pre-commit), or unset it to use auto-discovery"
|
||||
exit 1
|
||||
}
|
||||
$ErrorActionPreference = 'Continue'
|
||||
& $c -s -m pre_commit --version 2>&1 | Out-Null
|
||||
& $envPy -s -m pre_commit --version 2>&1 | Out-Null
|
||||
$rc = $LASTEXITCODE
|
||||
$ErrorActionPreference = $saved
|
||||
if ($rc -eq 0) { $py = $c; break }
|
||||
if ($rc -ne 0) {
|
||||
$ErrorActionPreference = 'Stop'
|
||||
Write-Host "::error::DTU_PRECOMMIT_PYTHON does not have a SYSTEM-visible pre-commit: $envPy"
|
||||
exit 1
|
||||
}
|
||||
$py = $envPy
|
||||
} else {
|
||||
$candidates = @(
|
||||
(Get-Command python -ErrorAction SilentlyContinue | Select-Object -ExpandProperty Source),
|
||||
(Join-Path $repoRoot '.venv\Scripts\python.exe')
|
||||
)
|
||||
foreach ($c in $candidates) {
|
||||
if (-not $c) { continue }
|
||||
if (-not (Test-Path $c)) { continue }
|
||||
$ErrorActionPreference = 'Continue'
|
||||
& $c -s -m pre_commit --version 2>&1 | Out-Null
|
||||
$rc = $LASTEXITCODE
|
||||
$ErrorActionPreference = $saved
|
||||
if ($rc -eq 0) { $py = $c; break }
|
||||
}
|
||||
}
|
||||
$ErrorActionPreference = 'Stop'
|
||||
if (-not $py) {
|
||||
Write-Host "::error::no Python with a SYSTEM-visible pre-commit. Tried: $($candidates -join ' | ')"
|
||||
Write-Host "::error::no Python with a SYSTEM-visible pre-commit (DTU_PRECOMMIT_PYTHON not set; tried PATH python and repo .venv)"
|
||||
Write-Host "::error::pre-commit is probably installed only in a USER site (invisible to SYSTEM)."
|
||||
Write-Host "::error::fix (elevated): powershell -ExecutionPolicy Bypass -File D:\Docker\act_runner\install_precommit_global.ps1"
|
||||
Write-Host "::error::fix: set a MACHINE-level DTU_PRECOMMIT_PYTHON for the runner service and restart it, or install pre-commit globally for the SYSTEM account (see the Gitea runner deployment guide in docs/)"
|
||||
exit 1
|
||||
}
|
||||
Write-Host "using python: $py"
|
||||
@@ -139,21 +164,31 @@ jobs:
|
||||
"PYTHON=$py" | Out-File -FilePath $env:GITHUB_ENV -Append
|
||||
|
||||
# --- cppcheck -----------------------------------------------------
|
||||
# cppcheck is often installed with a USER-scope PATH entry, which
|
||||
# SYSTEM cannot see. Fall back to its default install dir.
|
||||
$cpp = Get-Command cppcheck -ErrorAction SilentlyContinue
|
||||
if ($cpp) {
|
||||
Write-Host "found cppcheck: $($cpp.Source)"
|
||||
} elseif (Test-Path 'C:\Program Files\Cppcheck\cppcheck.exe') {
|
||||
$dir = 'C:\Program Files\Cppcheck'
|
||||
# Order per the DTU_* plan: DTU_CPPCHECK (explicit; invalid = hard
|
||||
# error, no fallback) -> PATH (Get-Command cppcheck). No fixed
|
||||
# install-dir guess: a USER-scope PATH entry is invisible to SYSTEM,
|
||||
# so on the runner set a MACHINE-level DTU_CPPCHECK if cppcheck is
|
||||
# not on SYSTEM's PATH.
|
||||
$envCpp = $env:DTU_CPPCHECK
|
||||
if ($envCpp) {
|
||||
if (-not (Test-Path $envCpp)) {
|
||||
Write-Host "::error::DTU_CPPCHECK is set but does not exist: $envCpp"
|
||||
exit 1
|
||||
}
|
||||
$dir = Split-Path -Parent $envCpp
|
||||
$env:Path = "$env:Path;$dir"
|
||||
$dir | Out-File -FilePath $env:GITHUB_PATH -Append
|
||||
Write-Host "cppcheck not on PATH; added $dir (User-scope PATH is invisible to SYSTEM)"
|
||||
Write-Host "using cppcheck from DTU_CPPCHECK: $envCpp"
|
||||
& $envCpp --version
|
||||
} else {
|
||||
Write-Host "::error::runner missing cppcheck -- install it, then re-run"
|
||||
exit 1
|
||||
$cpp = Get-Command cppcheck -ErrorAction SilentlyContinue
|
||||
if (-not $cpp) {
|
||||
Write-Host "::error::runner missing cppcheck (not on SYSTEM PATH) -- set a machine-level DTU_CPPCHECK, or add its directory to the machine PATH, then re-run"
|
||||
exit 1
|
||||
}
|
||||
Write-Host "found cppcheck: $($cpp.Source)"
|
||||
cppcheck --version
|
||||
}
|
||||
cppcheck --version
|
||||
|
||||
Write-Host "runner environment check passed"
|
||||
|
||||
@@ -257,19 +292,50 @@ jobs:
|
||||
id: msvc
|
||||
shell: powershell
|
||||
run: |
|
||||
# Keep in sync with VS_ROOTS in test/host/common/unit_test_harness.py
|
||||
$roots = @(
|
||||
'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools',
|
||||
'C:\Program Files\Microsoft Visual Studio\2022\BuildTools',
|
||||
'C:\Program Files\Microsoft Visual Studio\2022\Community',
|
||||
'C:\Program Files\Microsoft Visual Studio\2022\Professional'
|
||||
)
|
||||
# MSVC discovery per the DTU_* plan, kept in sync with
|
||||
# test/host/common/unit_test_harness.py:
|
||||
# DTU_MSVC_CL (explicit x64 cl.exe; invalid = hard error)
|
||||
# -> auto-probe standard VS roots derived from %ProgramFiles%
|
||||
# / %ProgramFiles(x86)% (2019 / 2022 / 2026, all editions)
|
||||
$found = $false
|
||||
foreach ($r in $roots) {
|
||||
if (Test-Path $r) {
|
||||
$cl = Get-ChildItem -Path $r -Recurse -Filter 'cl.exe' -ErrorAction SilentlyContinue |
|
||||
Where-Object { $_.FullName -like '*Hostx64\x64*' } | Select-Object -First 1
|
||||
if ($cl) { $found = $true; Write-Host "found cl.exe: $($cl.FullName)"; break }
|
||||
$envCl = $env:DTU_MSVC_CL
|
||||
if ($envCl) {
|
||||
if (-not (Test-Path $envCl)) {
|
||||
Write-Host "::error::DTU_MSVC_CL is set but does not exist: $envCl"
|
||||
exit 1
|
||||
}
|
||||
if ($envCl -notlike '*bin\Hostx64\x64\cl.exe') {
|
||||
Write-Host "::error::DTU_MSVC_CL must be the x64 Host compiler (path ending bin\Hostx64\x64\cl.exe): $envCl"
|
||||
exit 1
|
||||
}
|
||||
$found = $true
|
||||
Write-Host "using cl.exe from DTU_MSVC_CL: $envCl"
|
||||
} else {
|
||||
$pf = ${env:ProgramFiles}
|
||||
$pf86 = ${env:ProgramFiles(x86)}
|
||||
if (-not $pf) { $pf = 'C:\Program Files' }
|
||||
if (-not $pf86) { $pf86 = 'C:\Program Files (x86)' }
|
||||
$roots = @(
|
||||
(Join-Path $pf86 'Microsoft Visual Studio\2019\BuildTools'),
|
||||
(Join-Path $pf86 'Microsoft Visual Studio\2019\Community'),
|
||||
(Join-Path $pf86 'Microsoft Visual Studio\2019\Professional'),
|
||||
(Join-Path $pf 'Microsoft Visual Studio\2022\BuildTools'),
|
||||
(Join-Path $pf 'Microsoft Visual Studio\2022\Community'),
|
||||
(Join-Path $pf 'Microsoft Visual Studio\2022\Professional'),
|
||||
(Join-Path $pf 'Microsoft Visual Studio\2022\Enterprise'),
|
||||
(Join-Path $pf 'Microsoft Visual Studio\2026\BuildTools'),
|
||||
(Join-Path $pf 'Microsoft Visual Studio\2026\Community'),
|
||||
(Join-Path $pf 'Microsoft Visual Studio\18\BuildTools'),
|
||||
(Join-Path $pf 'Microsoft Visual Studio\18\Community'),
|
||||
(Join-Path $pf 'Microsoft Visual Studio\18\Professional'),
|
||||
(Join-Path $pf 'Microsoft Visual Studio\18\Enterprise')
|
||||
)
|
||||
foreach ($r in $roots) {
|
||||
if (Test-Path $r) {
|
||||
$cl = Get-ChildItem -Path $r -Recurse -Filter 'cl.exe' -ErrorAction SilentlyContinue |
|
||||
Where-Object { $_.FullName -like '*Hostx64\x64*' } | Select-Object -First 1
|
||||
if ($cl) { $found = $true; Write-Host "found cl.exe: $($cl.FullName)"; break }
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($found) {
|
||||
@@ -285,16 +351,27 @@ jobs:
|
||||
shell: powershell
|
||||
run: |
|
||||
# Resolve a working Python first (SYSTEM's PATH python may be unusable).
|
||||
# Order per the DTU_* plan: DTU_PRECOMMIT_PYTHON (explicit; invalid =
|
||||
# hard error) -> PATH python -> repo .venv.
|
||||
$repoRoot = (Get-Location).Path
|
||||
$py = $null
|
||||
foreach ($c in @(
|
||||
(Get-Command python -ErrorAction SilentlyContinue | Select-Object -ExpandProperty Source),
|
||||
(Join-Path $repoRoot '.venv\Scripts\python.exe'),
|
||||
'C:\ProgramData\anaconda3\python.exe'
|
||||
)) {
|
||||
if ($c -and (Test-Path $c)) { $py = $c; break }
|
||||
$envPy = $env:DTU_PRECOMMIT_PYTHON
|
||||
if ($envPy) {
|
||||
if (-not (Test-Path $envPy)) {
|
||||
Write-Host "::error::DTU_PRECOMMIT_PYTHON is set but does not exist: $envPy"
|
||||
exit 1
|
||||
}
|
||||
$py = $envPy
|
||||
}
|
||||
if (-not $py) { Write-Host "::error::no python found"; exit 1 }
|
||||
if (-not $py) {
|
||||
foreach ($c in @(
|
||||
(Get-Command python -ErrorAction SilentlyContinue | Select-Object -ExpandProperty Source),
|
||||
(Join-Path $repoRoot '.venv\Scripts\python.exe')
|
||||
)) {
|
||||
if ($c -and (Test-Path $c)) { $py = $c; break }
|
||||
}
|
||||
}
|
||||
if (-not $py) { Write-Host "::error::no python found (set DTU_PRECOMMIT_PYTHON or fix the runner PATH)"; exit 1 }
|
||||
Write-Host "using python: $py"
|
||||
|
||||
New-Item -ItemType Directory -Force -Path 'ci-artifacts' | Out-Null
|
||||
|
||||
Reference in New Issue
Block a user