diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 221a5c3b..a5504551 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -12,6 +12,10 @@ jobs: CONFIG: osx_64_ UPLOAD_PACKAGES: 'True' SHORT_CONFIG: osx_64_ + osx_arm64_: + CONFIG: osx_arm64_ + UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: osx_arm64_ timeoutInMinutes: 360 steps: diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index e5d09887..5b31da40 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -30,8 +30,6 @@ libssh2: - '1' libunwind: - '1.6' -mpfr: -- '4' pcre2: - '10.40' perl: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index c4dfb7be..dd526f20 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -26,8 +26,6 @@ libssh2: - '1' macos_machine: - x86_64-apple-darwin13.4.0 -mpfr: -- '4' pcre2: - '10.40' perl: diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml new file mode 100644 index 00000000..3ab9e658 --- /dev/null +++ b/.ci_support/osx_arm64_.yaml @@ -0,0 +1,42 @@ +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +arpack: +- '3.7' +c_compiler: +- clang +c_compiler_version: +- '15' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +curl: +- '8' +cxx_compiler: +- clangxx +cxx_compiler_version: +- '15' +fortran_compiler: +- gfortran +fortran_compiler_version: +- '12' +gmp: +- '6' +libssh2: +- '1' +macos_machine: +- arm64-apple-darwin20.0.0 +pcre2: +- '10.40' +perl: +- 5.32.1 +suitesparse: +- '5' +target_platform: +- osx-arm64 +zip_keys: +- - c_compiler_version + - cxx_compiler_version + - fortran_compiler_version +zlib: +- '1.2' diff --git a/README.md b/README.md index db2ba120..5709503e 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,13 @@ Current build status variant + + osx_arm64 + + + variant + + diff --git a/conda-forge.yml b/conda-forge.yml index 7f4c5921..8965415d 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,9 +1,11 @@ azure: store_build_artifacts: true +build_platform: + osx_arm64: osx_64 +conda_build: + pkg_format: '2' conda_forge_output_validation: true github: branch_name: main tooling_branch_name: main test: native_and_emulated -conda_build: - pkg_format: '2'