From 18d47ebbd3686a9f0f90700eee24e3f232463ba1 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Wed, 26 Feb 2025 22:49:01 -0500
Subject: [PATCH] GitLab CI: use short names like oa64/o64 so we can switch
 SDKs

---
 .gitlab/ci/jobs/macos-arm64.yml                        |  6 +++---
 .gitlab/ci/jobs/macos-x86_64.yml                       | 10 +++++-----
 ...{osxccross-universal.yml => osxcross-universal.yml} |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)
 rename .gitlab/ci/jobs/{osxccross-universal.yml => osxcross-universal.yml} (98%)

diff --git a/.gitlab/ci/jobs/macos-arm64.yml b/.gitlab/ci/jobs/macos-arm64.yml
index 6067444e8..dfa258b86 100644
--- a/.gitlab/ci/jobs/macos-arm64.yml
+++ b/.gitlab/ci/jobs/macos-arm64.yml
@@ -8,11 +8,11 @@ osxcross arm64:
       - "build.arm64/bin/"
       - "build.arm64/dist/arm64.h"
       - "build.arm64/src/config.h"
-    name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-arm64-apple-darwin21.4"
+    name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-arm64-apple-darwin"
 
   variables:
-    OSXCROSS_HOST: arm64-apple-darwin21.4
-    LD: arm64-apple-darwin21.4-ld
+    OSXCROSS_HOST: oa64
+    LD: /opt/osxcross.arm64/ld
 
   script:
     - - |
diff --git a/.gitlab/ci/jobs/macos-x86_64.yml b/.gitlab/ci/jobs/macos-x86_64.yml
index 3955a6a48..dcdceadc6 100644
--- a/.gitlab/ci/jobs/macos-x86_64.yml
+++ b/.gitlab/ci/jobs/macos-x86_64.yml
@@ -8,18 +8,18 @@ osxcross x86_64:
       - "build.x86_64/bin/"
       - "build.x86_64/dist/x86_64.h"
       - "build.x86_64/src/config.h"
-    name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86_64-apple-darwin21.4"
+    name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86_64-apple-darwin"
 
   variables:
-    OSXCROSS_HOST: x86_64-apple-darwin21.4
-    LD: x86_64-apple-darwin21.4-ld
+    OSXCROSS_HOST: o64
+    LD: /opt/osxcross.x86_64/ld
 
   script:
     - - |
           # apt_development
           echo -e "\e[0Ksection_start:`date +%s`:macports_development[collapsed=true]\r\e[0KInstalling development packages"
-      - osxcross-macports install libxmp wavpack libopenmpt opusfile || osxcross-macports install libxmp wavpack libopenmpt opusfile
-      - osxcross-macports install --static curl libsdl2_mixer libpng || osxcross-macports install --static curl libsdl2_mixer libpng
+      - osxcross-macports install         libxmp wavpack libopenmpt opusfile || osxcross-macports install         libxmp wavpack libopenmpt opusfile
+      - osxcross-macports install --static         curl libsdl2_mixer libpng || osxcross-macports install --static         curl libsdl2_mixer libpng
       - |
           # apt_development
           echo -e "\e[0Ksection_end:`date +%s`:macports_development\r\e[0K"
diff --git a/.gitlab/ci/jobs/osxccross-universal.yml b/.gitlab/ci/jobs/osxcross-universal.yml
similarity index 98%
rename from .gitlab/ci/jobs/osxccross-universal.yml
rename to .gitlab/ci/jobs/osxcross-universal.yml
index 841151f60..42bc12a57 100644
--- a/.gitlab/ci/jobs/osxccross-universal.yml
+++ b/.gitlab/ci/jobs/osxcross-universal.yml
@@ -15,7 +15,7 @@ osxcross universal:
       - "dist/bin"
       - "dist/src"
     expose_as: "Mac Universal"
-    name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-lipo-apple-darwin21.4"
+    name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-lipo-apple-darwin"
 
   script:
     - - |