diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cfe681897c53f10e45e01096fa9cd4d0998f6ab2..e363745f9e0dd6deafb8ad3f68dd81360b8cc29e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,19 +51,16 @@ versiondocs: - rm -rf ~www/ba/git-main/hugo-public - cp -r ../hugo/public ~www/ba/git-main/hugo-public -mac_x64: +mac_arm: tags: - - mac_x64_cloud + - mac_arm stage: build before_script: - # obtain nr of logical CPUs via `sysctl hw.logicalcpu` - - NPROC=12 - # Homebrew packages are installed in a non-standard path - - BREWDIR="/opt/homebrew-x86" - - PATH="$BREWDIR:$PATH" - - QTDIR="$BREWDIR/Cellar/qt/6.6.0" - - CCACHE="$BREWDIR/bin/ccache" + - QTDIR="/opt/homebrew/opt/qt" - 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 - OPTDIR="/Users/Shared/Software/scg" # print environmental variables @@ -81,19 +78,6 @@ mac_x64: - build/py/wheel/*.whl expire_in: 10 days -mac_arm: - tags: - - mac_arm - stage: build - before_script: - - QTDIR="/opt/homebrew/opt/qt" - - 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 - artifacts: *mac_artifacts - # To test the GitLab process _locally_ on MS-Windows with powershell (pwsh), # go to the root Git directory, and run: # C:\GitLab-Runner\gitlab-runner.exe exec shell --shell pwsh --builds-dir <gitlab build-dir> <job-name>