From 4cc4e935f5fb7a13058c496624f6574e6a523edd Mon Sep 17 00:00:00 2001
From: AlQuemist <alquemist@Lyriks>
Date: Thu, 5 Oct 2023 12:01:04 +0200
Subject: [PATCH] GitLab-CI: Use pyenv platform
---
.gitlab-ci.yml | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f160cb2db6b..32cd1ce5848 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@ native_Debian_clang:
- export PYTHONPATH=$CI_PROJECT_DIR/build/lib
- export MPLBACKEND=Agg
- QTCMAKE="/usr/local/Qt6/6.2.3/gcc_64/lib/cmake"
- - PYPLAT="/home/build/multipython/Python311"
+ - PYPLAT="/home/build/.pyenv/versions/3.11.6/"
- cmake --version
- clang --version
stage: build
@@ -22,7 +22,7 @@ native_Debian_clang:
- env
- mkdir build
- cd build
- - time cmake .. -GNinja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DBA_PY_PACKAGE=ON -DBA_PY_PLATFORM="$PYPLAT" -DCMAKE_PREFIX_PATH=$QTCMAKE -DZERO_TOLERANCE=ON -DDEVELOPER_CHECKS=ON
+ - time cmake .. -GNinja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DBA_PY_PACKAGE=ON -DCMAKE_PREFIX_PATH="$PYPLAT;$QTCMAKE" -DZERO_TOLERANCE=ON -DDEVELOPER_CHECKS=ON
- time ninja
- time xvfb-run -a ctest -j16 --output-on-failure
- time ninja package_source
@@ -59,6 +59,7 @@ mac_x64:
# obtain nr of logical CPUs via `sysctl hw.logicalcpu`
- NPROC=6
- QTDIR=/usr/local/opt/qt
+ - PYPLAT="/Users/scguser/.pyenv/versions/3.11.5/"
script: &mac_script
- OPTDIR="/Users/Shared/Software"
# print environmental variables
@@ -82,6 +83,7 @@ mac_arm:
stage: build
before_script:
- QTDIR="/opt/homebrew/opt/qt"
+ - PYPLAT="/Users/scguser/.pyenv/versions/3.11.5/"
# obtain nr of logical CPUs via `sysctl hw.logicalcpu`
- NPROC=14
script: *mac_script
@@ -108,6 +110,7 @@ windows:
- $BOOST_LIB_DIR = "$BOOST_DIR/lib"
- $QT_MSVC_DIR = "C:/Qt/6.2.4/msvc2019_64"
- $QTCMake_DIR = "$QT_MSVC_DIR/lib/cmake"
+ - $PY_PLATFORM_DIR = "C:/Users/admin/.pyenv/pyenv-win/versions/3.11.5/"
- $BUILD_DIR = "build"
# change the system PATH temporarily (needed for tests)
- $env:PYTHONPATH += "$CI_PROJECT_DIR/build/lib"
--
GitLab