From ce9bc869086159a8655e262500f00bd39cb4d860 Mon Sep 17 00:00:00 2001 From: Jacob Oursland Date: Thu, 24 Jul 2025 22:17:18 -0700 Subject: [PATCH] CI: fix macOS on x86_64 weekly builds Despite claims of compatibility with 'conda_build_config.yaml', rattler-build does not support all of the necessary capabilities to set the minimum macOS version. Converting the 'conda_build_config.yaml' to the rattler-build 'variants.yaml' corrects the issue. --- package/rattler-build/conda_build_config.yaml | 9 --------- package/rattler-build/recipe.yaml | 2 +- package/rattler-build/variants.yaml | 16 ++++++++++++++++ 3 files changed, 17 insertions(+), 10 deletions(-) delete mode 100644 package/rattler-build/conda_build_config.yaml create mode 100644 package/rattler-build/variants.yaml diff --git a/package/rattler-build/conda_build_config.yaml b/package/rattler-build/conda_build_config.yaml deleted file mode 100644 index 460cb041ef..0000000000 --- a/package/rattler-build/conda_build_config.yaml +++ /dev/null @@ -1,9 +0,0 @@ -c_compiler: # [win] - - vs2022 # [win] -cxx_compiler: # [win] - - vs2022 # [win] - -c_stdlib_version: # [osx and x86_64] - - "10.13" # [osx and x86_64] -MACOSX_DEPLOYMENT_TARGET: # [osx and x86_64] - - "10.13" # [osx and x86_64] diff --git a/package/rattler-build/recipe.yaml b/package/rattler-build/recipe.yaml index c2efc46e16..6575854198 100644 --- a/package/rattler-build/recipe.yaml +++ b/package/rattler-build/recipe.yaml @@ -90,7 +90,7 @@ requirements: - if: osx and x86_64 then: - - ${{ stdlib('c') }} + - __osx >=10.13 - if: build_platform != target_platform then: diff --git a/package/rattler-build/variants.yaml b/package/rattler-build/variants.yaml new file mode 100644 index 0000000000..847224ee8d --- /dev/null +++ b/package/rattler-build/variants.yaml @@ -0,0 +1,16 @@ +c_compiler: +- if: win + then: vs2022 +cxx_compiler: +- if: win + then: vs2022 + +c_stdlib_version: +- if: osx and x86_64 + then: "10.13" +MACOSX_SDK_VERSION: +- if: osx and x86_64 + then: "10.13" +MACOSX_DEPLOYMENT_TARGET: +- if: osx and x86_64 + then: "10.13"