From 2343044824b19032d0f73ff43580ea062e2d3170 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Fri, 1 Mar 2024 10:12:24 +0100
Subject: [PATCH] CI: temporarily rm mac_x86
---
.gitlab-ci.yml | 28 ++++++----------------------
1 file changed, 6 insertions(+), 22 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cfe681897c5..e363745f9e0 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>
--
GitLab