From 6088a76445afa97c17da97f96ef1785b5b2be163 Mon Sep 17 00:00:00 2001 From: Roger Qiu Date: Mon, 26 Jun 2023 18:59:31 +1000 Subject: [PATCH] ci: update to using M1 macos for builds and minimum deployment target to 10.15 --- .gitlab-ci.yml | 4 ++-- binding.gyp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3f96e07f..a7c21237 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -209,8 +209,8 @@ build:macos: stage: build needs: [] tags: - - shared-macos-amd64 - image: macos-11-xcode-12 + - saas-macos-medium-m1 + image: macos-12-xcode-14 variables: # Location node-gyp installed headers and static libraries npm_config_devdir: "${CI_PROJECT_DIR}/tmp/node-gyp" diff --git a/binding.gyp b/binding.gyp index 71d0d958..1fc955d2 100644 --- a/binding.gyp +++ b/binding.gyp @@ -52,7 +52,7 @@ }, 'VCLinkerTool': { 'AdditionalDependencies': [ - # SDK import libs + # Windows SDK libs required for rocksdb 'Shlwapi.lib', 'rpcrt4.lib' ] @@ -68,8 +68,8 @@ 'cflags+': [ '-fvisibility=hidden' ], 'cflags_cc+': [ '-fvisibility=hidden' ], 'xcode_settings': { - # Minimum mac osx target version (matches node v16.14.2) - 'MACOSX_DEPLOYMENT_TARGET': '10.13', + # Minimum mac osx target version (matches node v18.15.0 common.gypi) + 'MACOSX_DEPLOYMENT_TARGET': '10.15', # This is also needed to prevent exporting of symbols 'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES', 'OTHER_CFLAGS': [