luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-17 12:58:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

ci: Explicitly specify Python installation path on Windows

Browse Source 
Meson used to try and guess at the Python path. While this worked fine
for GLib before, it probably didn’t work 100% for other projects, so
Meson have made it an explicit option.

Set that option with the Python path used on the Windows CI machines.

This fixes a Meson warning with Meson >0.60.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
This commit is contained in:
Philip Withnall 2022-05-06 13:46:53 +01:00
parent f2d24f0b13
commit cc79d5bc7f
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.gitlab-ci.yml
View File

@ -322,7 +322,10 @@ vs2017-x64:
script: script:
# FIXME: These should use --wrap-mode=nodownload but the Windows CI machines # FIXME: These should use --wrap-mode=nodownload but the Windows CI machines
# aren’t currently set up for that. # aren’t currently set up for that.
- .gitlab-ci/test-msvc.bat ${MESON_COMMON_OPTIONS} --wrap-mode=default - .gitlab-ci/test-msvc.bat ${MESON_COMMON_OPTIONS}
--wrap-mode=default
--python.platlibdir=C:\Python37\site-packages
--python.purelibdir=C:\Python37\site-packages
artifacts: artifacts:
reports: reports:
junit: "_build/${env:CI_JOB_NAME}-report.xml" junit: "_build/${env:CI_JOB_NAME}-report.xml"
@ -347,7 +350,11 @@ vs2017-x64-static:
script: script:
# FIXME: These should use --wrap-mode=nodownload but the Windows CI machines # FIXME: These should use --wrap-mode=nodownload but the Windows CI machines
# aren’t currently set up for that. # aren’t currently set up for that.
- .gitlab-ci/test-msvc.bat ${MESON_COMMON_OPTIONS} --wrap-mode=default --default-library=static - .gitlab-ci/test-msvc.bat ${MESON_COMMON_OPTIONS}
--wrap-mode=default
--default-library=static
--python.platlibdir=C:\Python37\site-packages
--python.purelibdir=C:\Python37\site-packages
artifacts: artifacts:
reports: reports:
junit: "_build/${env:CI_JOB_NAME}-report.xml" junit: "_build/${env:CI_JOB_NAME}-report.xml"