diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index d08eed2c..25d96290 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,15 +5,17 @@ jobs: - job: osx pool: - vmImage: macOS-15 + vmImage: $(VMIMAGE) strategy: matrix: osx_64_: CONFIG: osx_64_ UPLOAD_PACKAGES: 'True' + VMIMAGE: macOS-15 osx_arm64_: CONFIG: osx_arm64_ UPLOAD_PACKAGES: 'True' + VMIMAGE: macOS-15-arm64 timeoutInMinutes: 360 variables: {} diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index 7be6b4bc..c9cc8747 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -1,5 +1,5 @@ MACOSX_DEPLOYMENT_TARGET: -- '10.15' +- '11.0' MACOSX_SDK_VERSION: - '11.0' brotli: @@ -13,7 +13,7 @@ c_compiler_version: c_stdlib: - macosx_deployment_target c_stdlib_version: -- '10.15' +- '11.0' channel_sources: - conda-forge channel_targets: diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index e78107fe..e7173480 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -1,12 +1,6 @@ -c_compiler: -- vs2022 -c_stdlib: -- vs channel_sources: - conda-forge channel_targets: - conda-forge main -cxx_compiler: -- vs2022 target_platform: - win-64 diff --git a/.ci_support/win_arm64_.yaml b/.ci_support/win_arm64_.yaml index 4f9e56b4..df64257d 100644 --- a/.ci_support/win_arm64_.yaml +++ b/.ci_support/win_arm64_.yaml @@ -1,12 +1,6 @@ -c_compiler: -- vs2022 -c_stdlib: -- vs channel_sources: - conda-forge channel_targets: - conda-forge main -cxx_compiler: -- vs2022 target_platform: - win-arm64 diff --git a/.github/workflows/conda-build.yml b/.github/workflows/conda-build.yml index a48bdf43..372424df 100644 --- a/.github/workflows/conda-build.yml +++ b/.github/workflows/conda-build.yml @@ -19,6 +19,7 @@ jobs: timeout-minutes: 360 strategy: fail-fast: false + max-parallel: 50 matrix: include: - CONFIG: linux_64_ @@ -34,7 +35,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4 + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 - name: Build on Linux id: build-linux diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 6831a529..c6ce2546 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -20,6 +20,7 @@ export PYTHONUNBUFFERED=1 export RECIPE_ROOT="${RECIPE_ROOT:-/home/conda/recipe_root}" export CI_SUPPORT="${FEEDSTOCK_ROOT}/.ci_support" export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml" +export RATTLER_CACHE_DIR="${FEEDSTOCK_ROOT}/build_artifacts/pkg_cache" cat >~/.condarc <