diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 75c569f072..ad310c760c 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -10,6 +10,10 @@ on: release: types: ['published'] +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: build: name: build (ios) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 46e6d9c996..95ee14e159 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -9,13 +9,16 @@ on: release: types: ['published'] +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true jobs: build: strategy: matrix: include: - - os: macos-12 + - os: macos-13 triplet: x64-osx deployment-target: "10.15" - os: macos-14 diff --git a/vcpkg/triplets/arm64-osx.cmake b/vcpkg/triplets/arm64-osx.cmake index 8a7cb2d809..46a233dc6a 100644 --- a/vcpkg/triplets/arm64-osx.cmake +++ b/vcpkg/triplets/arm64-osx.cmake @@ -7,5 +7,6 @@ set(VCPKG_OSX_ARCHITECTURES arm64) set(VCPKG_BUILD_TYPE release) set(VCPKG_OSX_DEPLOYMENT_TARGET 11.0) -set(VCPKG_C_FLAGS -mmacosx-version-min=11.0) -set(VCPKG_CXX_FLAGS -mmacosx-version-min=11.0) +# See https://github.com/microsoft/vcpkg/issues/10038 +set(VCPKG_C_FLAGS -mmacosx-version-min=${VCPKG_OSX_DEPLOYMENT_TARGET}) +set(VCPKG_CXX_FLAGS -mmacosx-version-min=${VCPKG_OSX_DEPLOYMENT_TARGET}) diff --git a/vcpkg/triplets/x64-osx.cmake b/vcpkg/triplets/x64-osx.cmake index 64a2d07f5d..1e454e2335 100644 --- a/vcpkg/triplets/x64-osx.cmake +++ b/vcpkg/triplets/x64-osx.cmake @@ -5,3 +5,8 @@ set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME Darwin) set(VCPKG_OSX_ARCHITECTURES x86_64) set(VCPKG_BUILD_TYPE release) + +set(VCPKG_OSX_DEPLOYMENT_TARGET 10.15) +# See https://github.com/microsoft/vcpkg/issues/10038 +set(VCPKG_C_FLAGS -mmacosx-version-min=${VCPKG_OSX_DEPLOYMENT_TARGET}) +set(VCPKG_CXX_FLAGS -mmacosx-version-min=${VCPKG_OSX_DEPLOYMENT_TARGET})