From fa4924bc1950a101b74d1e36dbed23e1890e0ab6 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Wed, 26 Feb 2025 21:16:20 -0500
Subject: [PATCH] GitLab CI: MacOS build does not use vcpkg

---
 .gitlab/ci/jobs/macos-x86_64.yml | 60 +-------------------------------
 1 file changed, 1 insertion(+), 59 deletions(-)

diff --git a/.gitlab/ci/jobs/macos-x86_64.yml b/.gitlab/ci/jobs/macos-x86_64.yml
index d40ae65f6..3955a6a48 100644
--- a/.gitlab/ci/jobs/macos-x86_64.yml
+++ b/.gitlab/ci/jobs/macos-x86_64.yml
@@ -1,38 +1,13 @@
 osxcross x86_64:
   extends: .srb2ci
 
-  stage: build
-
-  cache:
-    - key: ccache-$CI_JOB_NAME_SLUG-$CI_COMMIT_REF_SLUG
-      fallback_keys:
-        - ccache-$CI_JOB_NAME_SLUG-$CI_DEFAULT_BRANCH
-        - ccache-$CI_JOB_NAME_SLUG-master
-      paths:
-        - build/ccache
-        - build/ccache_statslog
-
-    - key: apt-$CI_JOB_IMAGE
-      paths:
-        - build/apt-cache
-      unprotect: true
-
-    - key: vcpkg-root
-      paths:
-        - build/vcpkg-root
-      unprotect: true
-
-    - key: vcpkg-binary-cache-x64-osx
-      paths:
-        - build/vcpkg-binary-cache
-      unprotect: true
+  stage: osxcross
 
   artifacts:
     paths:
       - "build.x86_64/bin/"
       - "build.x86_64/dist/x86_64.h"
       - "build.x86_64/src/config.h"
-    expose_as: "Mac x86_64"
     name: "$CI_PROJECT_PATH_SLUG-$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHORT_SHA-x86_64-apple-darwin21.4"
 
   variables:
@@ -40,27 +15,6 @@ osxcross x86_64:
     LD: x86_64-apple-darwin21.4-ld
 
   script:
-    - |
-        # vcpkg
-        echo -e "\e[0Ksection_start:`date +%s`:vcpkg-root[collapsed=true]\r\e[0KUpdating vcpkg"
-
-        if [ -d "build/vcpkg-root" ]; then
-          pushd build/vcpkg-root
-          git fetch https://github.com/Microsoft/vcpkg master
-          git reset --hard FETCH_HEAD
-          popd
-        else
-          mkdir -p build
-          git clone https://github.com/Microsoft/vcpkg build/vcpkg-root
-        fi
-
-        export VCPKG_ROOT=$(pwd)/build/vcpkg-root
-        export VCPKG_BINARY_SOURCES="clear;files,$(pwd)/build/vcpkg-binary-cache,readwrite"
-
-        mkdir -p "build/vcpkg-binary-cache"
-
-        echo -e "\e[0Ksection_end:`date +%s`:vcpkg-root\r\e[0K"
-
     - - |
           # apt_development
           echo -e "\e[0Ksection_start:`date +%s`:macports_development[collapsed=true]\r\e[0KInstalling development packages"
@@ -105,18 +59,6 @@ osxcross x86_64:
           # apt_clean
           echo -e "\e[0Ksection_end:`date +%s`:apt_clean\r\e[0K"
 
-    - - |
-          # vcpkg_clean
-          echo -e "\e[0Ksection_start:`date +%s`:vcpkg_clean[collapsed=true]\r\e[0KCleaning vcpkg-root"
-
-          if [ -d "build/vcpkg-root" ]; then
-            pushd "build/vcpkg-root"
-            git clean
-            popd
-          fi
-
-          echo -e "\e[0Ksection_end:`date +%s`:vcpkg_clean\r\e[0K"
-
     - - |
           # ccache_stats
           echo -e "\e[0Ksection_start:`date +%s`:ccache_stats[collapsed=true]\r\e[0Kccache statistics:"