diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ac78f0fb3ed8c509c7e2ee7761ed5cbe385b7359..11343af663537b32d17e3d6261ad48725de5fe57 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,13 +60,14 @@ mac_x64: - NPROC=6 - QTDIR=/usr/local/opt/qt - PYPLAT="/Users/scguser/.pyenv/versions/3.11.5/" + - CCACHE="/usr/local/bin/ccache" script: &mac_script - - OPTDIR="/Users/Shared/Software" + - OPTDIR="/Users/Shared/Software/scg" # print environmental variables - env - mkdir build - cd build - - cmake .. -DCMAKE_PREFIX_PATH="$PYPLAT;$OPTDIR;$QTDIR/lib/cmake" -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DBA_APPLE_BUNDLE=ON -DCMAKE_OSX_DEPLOYMENT_TARGET=11 -DCMAKE_INSTALL_PREFIX=/tmp/ba -DBA_PY_PACKAGE=ON + - cmake .. -DCMAKE_PREFIX_PATH="$PYPLAT;$OPTDIR;$QTDIR/lib/cmake" -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER_LAUNCHER="$CCACHE" -DBA_APPLE_BUNDLE=ON -DCMAKE_OSX_DEPLOYMENT_TARGET=11 -DCMAKE_INSTALL_PREFIX=/tmp/ba -DBA_PY_PACKAGE=ON - make -j$NPROC - ctest -j3 --output-on-failure - python3 var/mac_py_package.py @@ -83,7 +84,8 @@ mac_arm: stage: build before_script: - QTDIR="/opt/homebrew/opt/qt" - - PYPLAT="/Users/scguser/.pyenv/versions/3.11.5/" + - PYPLAT="/Users/qtisas/.pyenv/versions/3.11.6/" + - CCACHE="/opt/homebrew/bin/ccache" # obtain nr of logical CPUs via `sysctl hw.logicalcpu` - NPROC=14 script: *mac_script