Skip to content
Snippets Groups Projects
Commit 4cc4e935 authored by AlQuemist's avatar AlQuemist
Browse files

GitLab-CI: Use pyenv platform

parent 877e9180
No related branches found
No related tags found
3 merge requests!2050rebase main on r21/v21.1,!2047<root>/CMakeLists.txt: add 'BornAgain_LIBRARIES' cached variable to store...,!1988Migrate to pyenv Python Platform; Fix MacOS package (Major change)
Pipeline #114409 passed
...@@ -14,7 +14,7 @@ native_Debian_clang: ...@@ -14,7 +14,7 @@ native_Debian_clang:
- export PYTHONPATH=$CI_PROJECT_DIR/build/lib - export PYTHONPATH=$CI_PROJECT_DIR/build/lib
- export MPLBACKEND=Agg - export MPLBACKEND=Agg
- QTCMAKE="/usr/local/Qt6/6.2.3/gcc_64/lib/cmake" - 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 - cmake --version
- clang --version - clang --version
stage: build stage: build
...@@ -22,7 +22,7 @@ native_Debian_clang: ...@@ -22,7 +22,7 @@ native_Debian_clang:
- env - env
- mkdir build - mkdir build
- cd 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 ninja
- time xvfb-run -a ctest -j16 --output-on-failure - time xvfb-run -a ctest -j16 --output-on-failure
- time ninja package_source - time ninja package_source
...@@ -59,6 +59,7 @@ mac_x64: ...@@ -59,6 +59,7 @@ mac_x64:
# obtain nr of logical CPUs via `sysctl hw.logicalcpu` # obtain nr of logical CPUs via `sysctl hw.logicalcpu`
- NPROC=6 - NPROC=6
- QTDIR=/usr/local/opt/qt - QTDIR=/usr/local/opt/qt
- PYPLAT="/Users/scguser/.pyenv/versions/3.11.5/"
script: &mac_script script: &mac_script
- OPTDIR="/Users/Shared/Software" - OPTDIR="/Users/Shared/Software"
# print environmental variables # print environmental variables
...@@ -82,6 +83,7 @@ mac_arm: ...@@ -82,6 +83,7 @@ mac_arm:
stage: build stage: build
before_script: before_script:
- QTDIR="/opt/homebrew/opt/qt" - QTDIR="/opt/homebrew/opt/qt"
- PYPLAT="/Users/scguser/.pyenv/versions/3.11.5/"
# obtain nr of logical CPUs via `sysctl hw.logicalcpu` # obtain nr of logical CPUs via `sysctl hw.logicalcpu`
- NPROC=14 - NPROC=14
script: *mac_script script: *mac_script
...@@ -108,6 +110,7 @@ windows: ...@@ -108,6 +110,7 @@ windows:
- $BOOST_LIB_DIR = "$BOOST_DIR/lib" - $BOOST_LIB_DIR = "$BOOST_DIR/lib"
- $QT_MSVC_DIR = "C:/Qt/6.2.4/msvc2019_64" - $QT_MSVC_DIR = "C:/Qt/6.2.4/msvc2019_64"
- $QTCMake_DIR = "$QT_MSVC_DIR/lib/cmake" - $QTCMake_DIR = "$QT_MSVC_DIR/lib/cmake"
- $PY_PLATFORM_DIR = "C:/Users/admin/.pyenv/pyenv-win/versions/3.11.5/"
- $BUILD_DIR = "build" - $BUILD_DIR = "build"
# change the system PATH temporarily (needed for tests) # change the system PATH temporarily (needed for tests)
- $env:PYTHONPATH += "$CI_PROJECT_DIR/build/lib" - $env:PYTHONPATH += "$CI_PROJECT_DIR/build/lib"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment