1
0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2024-12-25 23:21:26 +03:00

gitlab-ci: Only install cmake MinGW package if needed

On MinGW, cmake requires curl which requires nghttp2 which requires
libxml2. But having a system libxml2 interferes with the Python tests
for now. Ultimately, we should use Python's os.add_dll_directory() on
Windows. I'm not sure why the current solution using PATH even works.
This commit is contained in:
Nick Wellnhofer 2022-09-06 18:24:25 +02:00
parent 7ab3228f21
commit e86ede09d4
2 changed files with 6 additions and 11 deletions

View File

@ -147,7 +147,7 @@ cmake:linux:clang:static:
before_script:
- "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12"
- $Env:Path="C:\msys64\$Env:MINGW_PATH\bin;C:\msys64\usr\bin;$Env:Path"
- bash -lc 'sh .gitlab-ci/setup_mingw.sh'
- bash -lc 'sh .gitlab-ci/setup_mingw.sh cmake ninja'
- .gitlab-ci/Install-7-Zip
- .gitlab-ci/Fetch-W3C-Tests
script:

View File

@ -1,16 +1,11 @@
#!/bin/sh
pacman --noconfirm -Syu
prefix=
if [ -n "$MINGW_PACKAGE_PREFIX" ]; then
prefix="${MINGW_PACKAGE_PREFIX}-"
fi
pacman --noconfirm -Syu
pacman --noconfirm -S --needed \
${prefix}autotools \
${prefix}cmake \
${prefix}libiconv \
${prefix}ninja \
${prefix}python \
${prefix}xz \
${prefix}zlib
for module in autotools libiconv python xz zlib "$@"; do
pacman --noconfirm -S --needed ${prefix}$module
done