diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 4c11f4748..c4b0e7b6d 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -12,6 +12,10 @@ jobs: CONFIG: win_64_ UPLOAD_PACKAGES: 'True' SHORT_CONFIG: win_64_ + win_arm64_: + CONFIG: win_arm64_ + UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: win_arm64_ timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ diff --git a/.ci_support/migrations/libffi35.yaml b/.ci_support/migrations/libffi35.yaml deleted file mode 100644 index cccfdc464..000000000 --- a/.ci_support/migrations/libffi35.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libffi 3.5 - kind: version - migration_number: 1 -libffi: -- '3.5' -migrator_ts: 1760302128.4447467 diff --git a/.ci_support/win_arm64_.yaml b/.ci_support/win_arm64_.yaml new file mode 100644 index 000000000..435b2b016 --- /dev/null +++ b/.ci_support/win_arm64_.yaml @@ -0,0 +1,39 @@ +build_type: +- release +bzip2: +- '1' +c_compiler: +- vs2022 +c_stdlib: +- vs +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +cxx_compiler: +- vs2022 +expat: +- '2' +libffi: +- '3.5' +liblzma_devel: +- '5' +openssl: +- '3.5' +pin_run_as_build: + python: + min_pin: x.x + max_pin: x.x +python: +- '3.12' +sqlite: +- '3' +target_platform: +- win-arm64 +tk: +- '8.6' +zip_keys: +- - build_type + - channel_targets +zlib: +- '1' diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 361edeb2c..bac7141a9 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -63,6 +63,25 @@ if [[ "${sha:-}" == "" ]]; then sha=$(git rev-parse HEAD) fi +if [[ "${OSX_SDK_DIR:-}" == "" ]]; then + if [[ "${CI:-}" == "" ]]; then + echo "Please set OSX_SDK_DIR to a directory where SDKs can be downloaded to. Aborting" + exit 1 + else + export OSX_SDK_DIR=/opt/conda-sdks + /usr/bin/sudo mkdir -p "${OSX_SDK_DIR}" + /usr/bin/sudo chown "${USER}" "${OSX_SDK_DIR}" + fi +else + if tmpf=$(mktemp -p "$OSX_SDK_DIR" tmp.XXXXXXXX 2>/dev/null); then + rm -f "$tmpf" + echo "OSX_SDK_DIR is writeable without sudo, continuing" + else + echo "User-provided OSX_SDK_DIR is not writeable for current user! Aborting" + exit 1 + fi +fi + echo -e "\n\nRunning the build setup script." source run_conda_forge_build_setup diff --git a/README.md b/README.md index 36ec5225a..67e03ffbe 100644 --- a/README.md +++ b/README.md @@ -115,6 +115,13 @@ Current build status variant + + win_arm64 + + + variant + + diff --git a/conda-forge.yml b/conda-forge.yml index 52e254134..fb963c568 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -10,6 +10,7 @@ build_platform: linux_aarch64: linux_64 linux_ppc64le: linux_64 osx_arm64: osx_64 + win_arm64: win_64 conda_build: pkg_format: '2' conda_forge_output_validation: true diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e3a08b9a3..15f57b815 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -80,6 +80,8 @@ build: requirements: build: + - python # [build_platform != target_platform] + - cross-python_{{ target_platform }} # [build_platform != target_platform] {% if from_source_control == 'yes' %} - git {% else %}