From 26fdeb8870c7366c0c32434998d271992fce4291 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 4 Sep 2024 15:25:34 +1100 Subject: [PATCH] switch channel order to avoid old rc-compilers --- .ci_support/linux_64_.yaml | 2 +- .ci_support/osx_64_.yaml | 2 +- .ci_support/osx_arm64_.yaml | 2 +- recipe/conda_build_config.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index 3ba5d264..2c11cee0 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -9,7 +9,7 @@ c_stdlib_version: cdt_name: - cos7 channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge,conda-forge/label/llvm_rc channel_targets: - conda-forge llvm_rc cxx_compiler: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 722630ef..23432787 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '10.13' channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge,conda-forge/label/llvm_rc channel_targets: - conda-forge llvm_rc cxx_compiler: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index c331ee38..97746927 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -11,7 +11,7 @@ c_stdlib: c_stdlib_version: - '11.0' channel_sources: -- conda-forge/label/llvm_rc,conda-forge +- conda-forge,conda-forge/label/llvm_rc channel_targets: - conda-forge llvm_rc cxx_compiler: diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 0f1de9b0..aa56716e 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -48,7 +48,7 @@ sys_abi: # [osx] # - pre-12 # [osx] channel_sources: - - conda-forge/label/llvm_rc,conda-forge + - conda-forge,conda-forge/label/llvm_rc # publish the pre-12 ABI & hardened builds to a separate label channel_targets: