Remove non-working windows logging, revert MacOS deployment target ve…

…rsion
geopandas · Dec 23, 2024 · 8e49fec · 8e49fec
1 parent 440873a
commit 8e49fec
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -208,14 +208,6 @@ jobs:
           vcpkg install --overlay-triplets=./ci/custom-triplets --feature-flags="versions,manifests" --x-manifest-root=./ci --x-install-root=$VCPKG_INSTALLATION_ROOT/installed --debug
           vcpkg list
 
-      # FIXME: remove
-      - name: Log windows install directory
-        if: ${{ runner.os == 'Windows' }}
-        run: |
-          ls $VCPKG_INSTALLATION_ROOT/installed
-          ls $VCPKG_INSTALLATION_ROOT/installed/x64-windows-dynamic-release
-          ls $VCPKG_INSTALLATION_ROOT/installed/x64-windows-dynamic-release/bin
-
       - name: Upload vcpkg build logs
         if: ${{ failure() }}
         uses: actions/upload-artifact@v4

diff --git a/ci/custom-triplets/arm64-osx-dynamic-release.cmake b/ci/custom-triplets/arm64-osx-dynamic-release.cmake
@@ -3,9 +3,10 @@ set(VCPKG_CRT_LINKAGE dynamic)
 set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
 set(VCPKG_OSX_ARCHITECTURES arm64)
 set(VCPKG_BUILD_TYPE release)
-set(VCPKG_OSX_DEPLOYMENT_TARGET "14.0")
+set(VCPKG_OSX_DEPLOYMENT_TARGET "12.0")
 
 set(VCPKG_LIBRARY_LINKAGE static)
+
 if(PORT MATCHES "gdal")
     set(VCPKG_LIBRARY_LINKAGE dynamic)
 endif()