[glib: 9/10] ci: Explicitly specify Python installation path on Windows




commit cc79d5bc7fceeb8e5739d0625bd7e5008b216efb
Author: Philip Withnall <pwithnall endlessos org>
Date:   Fri May 6 13:46:53 2022 +0100

    ci: Explicitly specify Python installation path on Windows
    
    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>

 .gitlab-ci.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 633b3527da..d5db361d94 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -322,7 +322,10 @@ vs2017-x64:
   script:
     # FIXME: These should use --wrap-mode=nodownload but the Windows CI machines
     # 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:
     reports:
       junit: "_build/${env:CI_JOB_NAME}-report.xml"
@@ -347,7 +350,11 @@ vs2017-x64-static:
   script:
     # FIXME: These should use --wrap-mode=nodownload but the Windows CI machines
     # 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:
     reports:
       junit: "_build/${env:CI_JOB_NAME}-report.xml"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]