Use dedicated release triplets.

They also specify the minimum macOS version.
TileDB-Inc · Nov 15, 2023 · 348acaf · 348acaf
1 parent 1d60b1a
commit 348acaf
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 2 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -27,20 +27,25 @@ jobs:
         include:
           - platform: windows-x86_64
             os: windows-latest
+            triplet: x64-windows-release
           - platform: linux-x86_64
             os: ubuntu-latest
             manylinux: true
+            triplet: x64-linux-release
           - platform: linux-x86_64-noavx2
             os: ubuntu-latest
             cmake_args: -DCOMPILER_SUPPORTS_AVX2=OFF
+            triplet: x64-linux-release
             manylinux: true
           - platform: macos-x86_64
             os: macos-latest
             MACOSX_DEPLOYMENT_TARGET: 10.14
+            triplet: x64-osx-release
           - platform: macos-arm64
             os: macos-latest
             cmake_args: -DCMAKE_OSX_ARCHITECTURES=arm64
             MACOSX_DEPLOYMENT_TARGET: 11
+            triplet: arm64-osx-release
     runs-on: ${{ matrix.os }}
     container: ${{ matrix.manylinux && 'quay.io/pypa/manylinux2014_x86_64' || '' }}
     env:
@@ -51,8 +56,6 @@ jobs:
       - name: Checkout TileDB
         # v4 uses node 20 which is incompatible with the libc version of the manylinux image
         uses: actions/checkout@v3
-      - name: Prevent vpckg from building debug variants        
-        run: python ./scripts/ci/patch_vcpkg_triplets.py
       - name: Export GitHub Actions cache variables
         uses: actions/github-script@v6
         with:
@@ -86,6 +89,7 @@ jobs:
             -DTILEDB_WEBP=ON \
             -DTILEDB_STATIC=OFF \
             -DTILEDB_TESTS=OFF \
+            -DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }} \
             ${{ matrix.cmake_args }}
         shell: bash
       - name: Build TileDB

diff --git a/ports/triplets/arm64-osx-release.cmake b/ports/triplets/arm64-osx-release.cmake
@@ -0,0 +1,9 @@
+set(VCPKG_TARGET_ARCHITECTURE arm64)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE static)
+
+set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
+set(VCPKG_OSX_ARCHITECTURES arm64)
+set(VCPKG_OSX_DEPLOYMENT_TARGET 11.0)
+
+set(VCPKG_BUILD_TYPE release)
diff --git a/ports/triplets/x64-linux-release.cmake b/ports/triplets/x64-linux-release.cmake
@@ -0,0 +1,7 @@
+set(VCPKG_TARGET_ARCHITECTURE x64)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE static)
+
+set(VCPKG_CMAKE_SYSTEM_NAME Linux)
+
+set(VCPKG_BUILD_TYPE release)
diff --git a/ports/triplets/x64-osx-release.cmake b/ports/triplets/x64-osx-release.cmake
@@ -0,0 +1,9 @@
+set(VCPKG_TARGET_ARCHITECTURE x64)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE static)
+
+set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
+set(VCPKG_OSX_ARCHITECTURES x86_64)
+set(VCPKG_OSX_DEPLOYMENT_TARGET 10.14)
+
+set(VCPKG_BUILD_TYPE release)
diff --git a/ports/triplets/x64-windows-release.cmake b/ports/triplets/x64-windows-release.cmake
@@ -0,0 +1,7 @@
+set(VCPKG_TARGET_ARCHITECTURE x64)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE static)
+
+set(X_VCPKG_APPLOCAL_DEPS_INSTALL ON)
+
+set(VCPKG_BUILD_TYPE release)