From 17eca67cba7ce269e5aed99838ac00d637b34c12 Mon Sep 17 00:00:00 2001
From: Immanuel Haffner <haffner.immanuel@gmail.com>
Date: Sat, 4 May 2024 18:58:08 +0200
Subject: [PATCH] [CI] Run commands within our Pipenv.

This is particluarly necessary for Google depot_tools, as they require
the correct Python version.
---
 .gitlab-ci.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9a3bc015..7cb0e80a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -133,7 +133,8 @@ build:debug:linux-amd64:
         - .shared
         - .build_cache
     script:
-        - cmake -S . -B build/${BUILD_TYPE}
+        - pipenv --python $PYTHON_VERSION sync
+        - pipenv run cmake -S . -B build/${BUILD_TYPE}
           --fresh
           -G Ninja
           -DCMAKE_C_COMPILER=clang
@@ -143,8 +144,8 @@ build:debug:linux-amd64:
           -DWITH_V8=ON
           -DENABLE_SANITIZERS=ON
           -DENABLE_SANITY_FIELDS=ON
-        - cmake --build build/${BUILD_TYPE} --target Boost gitversion
-        - cmake --build build/${BUILD_TYPE} --target all unittest
+        - pipenv run cmake --build build/${BUILD_TYPE} --target Boost gitversion
+        - pipenv run cmake --build build/${BUILD_TYPE} --target all unittest
         - find build/${BUILD_TYPE}/third-party -name '*.so' -exec cp {} build/${BUILD_TYPE}/lib \; # collect shared libraries
         - find build/${BUILD_TYPE}/third-party -name '*.so.*' -exec cp {} build/${BUILD_TYPE}/lib \; # collect shared libraries
     artifacts:
@@ -163,7 +164,8 @@ build:debug:macos-amd64:
         - .shared
         - .build_cache
     script:
-        - cmake -S . -B build/${BUILD_TYPE}
+        - pipenv --python $PYTHON_VERSION sync
+        - pipenv run cmake -S . -B build/${BUILD_TYPE}
           --fresh
           -G Ninja
           -DCMAKE_C_COMPILER=$(brew --prefix llvm@17)/bin/clang
@@ -173,8 +175,8 @@ build:debug:macos-amd64:
           -DWITH_V8=ON
           -DENABLE_SANITIZERS=ON
           -DENABLE_SANITY_FIELDS=ON
-        - cmake --build build/${BUILD_TYPE} --target Boost gitversion
-        - cmake --build build/${BUILD_TYPE} --target all unittest
+        - pipenv run cmake --build build/${BUILD_TYPE} --target Boost gitversion
+        - pipenv run cmake --build build/${BUILD_TYPE} --target all unittest
         - find build/${BUILD_TYPE}/third-party -name '*.dylib' -exec cp {} build/${BUILD_TYPE}/lib \; # collect shared libraries
         - find build/${BUILD_TYPE}/third-party -name '*.dylib.*' -exec cp {} build/${BUILD_TYPE}/lib \; # collect shared libraries
     artifacts: