Merge pull request #777 from apache/hotfix/mac-upgrade

Upgrade macos-build-conan and mac-build to use macOS-13.
apache · Dec 4, 2024 · db14807 · db14807
2 parents 08e8f8d + 4d5fde5
commit db14807
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/conan_create.yml b/.github/workflows/conan_create.yml
@@ -76,7 +76,7 @@ jobs:
           conan remove -c celix/* 
 
   mac-build:
-    runs-on: macOS-12
+    runs-on: macOS-13
     timeout-minutes: 120
     steps:
       - name: Checkout source code

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -16,7 +16,7 @@ env:
 jobs:
 
   macos-build-conan:
-    runs-on: macOS-12
+    runs-on: macOS-13
     timeout-minutes: 120
     steps:
       - name: Checkout source code

diff --git a/bundles/cxx_remote_services/admin/src/RemoteServiceAdmin.h b/bundles/cxx_remote_services/admin/src/RemoteServiceAdmin.h
@@ -28,6 +28,11 @@
 #include <version>
 #endif
 
+#  if defined(__cpp_lib_memory_resource) \
+    && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED)  && __MAC_OS_X_VERSION_MIN_REQUIRED  < 140000) \
+     || (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 170000))
+#   undef __cpp_lib_memory_resource // Only supported on macOS 14 and iOS 17
+#  endif
 #if __cpp_lib_memory_resource
 #include <memory_resource>
 #endif