gitlab-ci, build: Do not run splitted macOS jobs on anymore

More preparition to x64 support

As a ugly regression, it will not be possible to create .dmgs on
forks anymore without an explicit "Run pipeline" from a Developer.

I hope to fix that when we take our sponsored runner from CircleCI.

.gitlab-ci.yml

@@ -666,6 +666,7 @@ gimp-win-eol:
         VARIANT: -homebrew
   tags:
     - macos
+    - marathon
   variables:
     ARCH: arm64
     ORKA_RUNNER: tahoe-1
@@ -673,7 +674,7 @@ gimp-win-eol:
   before_script:
     - export GIMP_PREFIX="$PWD/_install-$(uname -m)"
     - export PATH="$OPT_PREFIX/bin:$PATH"
-  timeout: 150m
+  timeout: 4h
 
 .macos_environ: &MAC_ENVIRON
 - printf "\e[0Ksection_start:`date +%s`:macos_environ[collapsed=true]\r\e[0KPreparing build environment\n"
@@ -685,50 +686,14 @@ gimp-win-eol:
 - export GI_TYPELIB_PATH="${GIMP_PREFIX}/lib/girepository-1.0:${OPT_PREFIX}/lib/girepository-1.0"
 - printf "\e[0Ksection_end:`date +%s`:macos_environ\r\e[0K\n"
 
-deps-macos-inhouse-part1:
-  #This splitted job is needed to rebuild 'vala' in time when it is bumped
-  extends: .macos-inhouse
-  stage: dependencies
-  cache:
-    - key: $CI_PROJECT_NAMESPACE-$ARCH
-      unprotect: true
-      paths:
-        - macports-cached-$ARCH
-      policy: pull
-  script:
-    # Do not call sh since it is old bash on macOS, not the default zsh
-    - zsh build/macos/1_build-deps-macports.sh --part1
-  artifacts:
-    paths:
-      - macports-$ARCH
-    expire_in: 2 hours
-
-deps-macos-inhouse-part2:
-  #This splitted job is needed to rebuild 'rust' in time when it is bumped
-  extends: .macos-inhouse
-  needs: ["deps-macos-inhouse-part1"]
-  stage: dependencies
-  script:
-    # Do not call sh since it is old bash on macOS, not the default zsh
-    - zsh build/macos/1_build-deps-macports.sh --part2
-  artifacts:
-    paths:
-      - macports-$ARCH
-    expire_in: 2 hours
-
 deps-macos-inhouse:
   extends: .macos-inhouse
-  needs:
-    - job: deps-macos-inhouse-part2
-      #to allow running the Homebrew builds which use precompiled binaries
-      optional: true
   stage: dependencies
   cache:
     - key: $CI_PROJECT_NAMESPACE-$ARCH
       unprotect: true
       paths:
         - macports-cached-$ARCH
-      policy: push
   script:
     # Do not call sh since it is old bash on macOS, not the default zsh
     - zsh build/macos/1_build-deps-macports.sh

build/macos/1_build-deps-macports.sh

@@ -39,7 +39,7 @@ printf "\e[0Ksection_start:`date +%s`:deps_install[collapsed=true]\r\e[0KInstall
 if [ -f "$OPT_PREFIX/bin/port" ]; then
   eval $( [ "$OPT_PREFIX" = /opt/local ] && echo sudo ) port sync && eval $( [ "$OPT_PREFIX" = /opt/local ] && echo sudo ) port upgrade outdated
   if [ "$CI_JOB_NAME" ] && ls -d macports* 2>/dev/null | grep -q .; then
-    if echo "$CI_JOB_NAME" | grep -q 'part1' && [ -d "macports-cached-$(uname -m)" ]; then
+    if [ -d "macports-cached-$(uname -m)" ]; then
       cp -fa macports-cached-$(uname -m)/* $OPT_PREFIX/var/macports || true
     elif [ -d "macports-$(uname -m)" ]; then
       cp -fa macports-$(uname -m)/* $OPT_PREFIX/var/macports || true