diff options
| author | Mats Wichmann <mats@linux.com> | 2023-01-18 14:12:42 -0700 |
|---|---|---|
| committer | Mats Wichmann <mats@linux.com> | 2023-01-19 08:04:30 -0700 |
| commit | 704ad77c0648a026def09c17e99dd365300ca2a7 (patch) | |
| tree | cd4d77fac4fc383492f7eacb627d93ce94ff1756 /.appveyor | |
| parent | f9b27906ef5a1540774210e6adf7c954cf7d81b6 (diff) | |
| download | scons-git-704ad77c0648a026def09c17e99dd365300ca2a7.tar.gz | |
Adjust the appveyor build
Skip lxml install, our Windows CI doesn't need it
Skip installing coverage if not a coverage run
Drop an uneeded test skip
Signed-off-by: Mats Wichmann <mats@linux.com>
Diffstat (limited to '.appveyor')
| -rw-r--r-- | .appveyor/exclude_tests.ps1 (renamed from .appveyor/disable_msvc_10.ps1) | 3 | ||||
| -rw-r--r-- | .appveyor/install-cov.bat | 2 | ||||
| -rw-r--r-- | .appveyor/install.bat | 12 |
3 files changed, 12 insertions, 5 deletions
diff --git a/.appveyor/disable_msvc_10.ps1 b/.appveyor/exclude_tests.ps1 index 086f1e4b4..6006a5cb5 100644 --- a/.appveyor/disable_msvc_10.ps1 +++ b/.appveyor/exclude_tests.ps1 @@ -1,4 +1,7 @@ New-Item -Name exclude_list.txt -ItemType File; + +# exclude VS 10.0 because it hangs the testing until this is resolved: +# https://help.appveyor.com/discussions/problems/19283-visual-studio-2010-trial-license-has-expired $workaround_image = "Visual Studio 2015"; if ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq $workaround_image) { Add-Content -Path 'exclude_list.txt' -Value 'test\MSVS\vs-10.0-exec.py'; diff --git a/.appveyor/install-cov.bat b/.appveyor/install-cov.bat new file mode 100644 index 000000000..7dbc9457e --- /dev/null +++ b/.appveyor/install-cov.bat @@ -0,0 +1,2 @@ +for /F "tokens=*" %%g in ('C:\\%WINPYTHON%\\python.exe -c "import sys; print(sys.path[-1])"') do (set PYSITEDIR=%%g) +C:\\%WINPYTHON%\\python.exe -m pip install -U --progress-bar off coverage codecov diff --git a/.appveyor/install.bat b/.appveyor/install.bat index b014dc711..561faacd2 100644 --- a/.appveyor/install.bat +++ b/.appveyor/install.bat @@ -1,12 +1,14 @@ C:\\%WINPYTHON%\\python.exe --version for /F "tokens=*" %%g in ('C:\\%WINPYTHON%\\python.exe -c "import sys; print(sys.path[-1])"') do (set PYSITEDIR=%%g) REM use mingw 32 bit until #3291 is resolved +REM add python and python user-base to path for pip installs set PATH=C:\\%WINPYTHON%;C:\\%WINPYTHON%\\Scripts;C:\\ProgramData\\chocolatey\\bin;C:\\MinGW\\bin;C:\\MinGW\\msys\\1.0\\bin;C:\\cygwin\\bin;C:\\msys64\\usr\\bin;C:\\msys64\\mingw64\\bin;%PATH% C:\\%WINPYTHON%\\python.exe -m pip install -U --progress-bar off pip setuptools wheel -C:\\%WINPYTHON%\\python.exe -m pip install -U --progress-bar off coverage codecov -set STATIC_DEPS=true & C:\\%WINPYTHON%\\python.exe -m pip install -U --progress-bar off lxml -C:\\%WINPYTHON%\\python.exe -m pip install -U --progress-bar off -r requirements-dev.txt -REM install 3rd party tools to test with +REM No real use for lxml on Windows (and some versions don't have it): +REM We don't install the docbook bits so those tests won't run anyway +REM The Windows builds don't attempt to make the docs +REM Adjust this as requirements-dev.txt changes. +REM C:\\%WINPYTHON%\\python.exe -m pip install -U --progress-bar off -r requirements-dev.txt +C:\\%WINPYTHON%\\python.exe -m pip install -U --progress-bar off ninja psutil choco install --allow-empty-checksums dmd ldc swig vswhere xsltproc winflexbison3 -set SCONS_CACHE_MSVC_CONFIG=true set |