Skip to content
Snippets Groups Projects
Commit ee4f953bd1a1 authored by Nick Wellnhofer's avatar Nick Wellnhofer
Browse files

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.
parent ad6f8eb0f3a1
No related branches found
No related tags found
No related merge requests found
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
before_script: before_script:
- "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12" - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12"
- $Env:Path="C:\msys64\$Env:MINGW_PATH\bin;C:\msys64\usr\bin;$Env:Path" - $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 autotools'
script: script:
- bash -lc 'sh .gitlab-ci/test.sh' - bash -lc 'sh .gitlab-ci/test.sh'
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
before_script: before_script:
- "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12" - "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12"
- $Env:Path="C:\msys64\$Env:MINGW_PATH\bin;C:\msys64\usr\bin;$Env:Path" - $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/Install-7-Zip
- git clone --depth 1 https://gitlab.gnome.org/GNOME/libxml2.git libxml2-source - git clone --depth 1 https://gitlab.gnome.org/GNOME/libxml2.git libxml2-source
- cmake -G Ninja -DBUILD_SHARED_LIBS=$Env:BUILD_SHARED_LIBS -DCMAKE_INSTALL_PREFIX=libxml2-install -DLIBXML2_WITH_TESTS=OFF -S libxml2-source -B libxml2-build - cmake -G Ninja -DBUILD_SHARED_LIBS=$Env:BUILD_SHARED_LIBS -DCMAKE_INSTALL_PREFIX=libxml2-install -DLIBXML2_WITH_TESTS=OFF -S libxml2-source -B libxml2-build
......
#!/bin/sh #!/bin/sh
pacman --noconfirm -Syu
prefix= prefix=
if [ -n "$MINGW_PACKAGE_PREFIX" ]; then if [ -n "$MINGW_PACKAGE_PREFIX" ]; then
prefix="${MINGW_PACKAGE_PREFIX}-" prefix="${MINGW_PACKAGE_PREFIX}-"
fi fi
...@@ -3,14 +5,7 @@ ...@@ -3,14 +5,7 @@
prefix= prefix=
if [ -n "$MINGW_PACKAGE_PREFIX" ]; then if [ -n "$MINGW_PACKAGE_PREFIX" ]; then
prefix="${MINGW_PACKAGE_PREFIX}-" prefix="${MINGW_PACKAGE_PREFIX}-"
fi fi
for module in libiconv python xz zlib "$@"; do
pacman --noconfirm -Syu pacman --noconfirm -S --needed ${prefix}$module
pacman --noconfirm -S --needed \ done
${prefix}autotools \
${prefix}cmake \
${prefix}libiconv \
${prefix}ninja \
${prefix}python \
${prefix}xz \
${prefix}zlib
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment