diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index fbfac7e3..336cf077 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -16,8 +16,8 @@ jobs: CONFIG: linux_64_cross_target_platformosx-64version20.1.8 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - linux_64_cross_target_platformosx-64version21.1.0: - CONFIG: linux_64_cross_target_platformosx-64version21.1.0 + linux_64_cross_target_platformosx-64version21.1.2: + CONFIG: linux_64_cross_target_platformosx-64version21.1.2 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 linux_64_cross_target_platformosx-arm64version19.1.7: @@ -28,8 +28,8 @@ jobs: CONFIG: linux_64_cross_target_platformosx-arm64version20.1.8 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - linux_64_cross_target_platformosx-arm64version21.1.0: - CONFIG: linux_64_cross_target_platformosx-arm64version21.1.0 + linux_64_cross_target_platformosx-arm64version21.1.2: + CONFIG: linux_64_cross_target_platformosx-arm64version21.1.2 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index a1d12d11..16079803 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -5,7 +5,7 @@ jobs: - job: osx pool: - vmImage: macOS-13 + vmImage: macOS-15 strategy: matrix: osx_64_cross_target_platformosx-64version19.1.7: @@ -14,8 +14,8 @@ jobs: osx_64_cross_target_platformosx-64version20.1.8: CONFIG: osx_64_cross_target_platformosx-64version20.1.8 UPLOAD_PACKAGES: 'True' - osx_64_cross_target_platformosx-64version21.1.0: - CONFIG: osx_64_cross_target_platformosx-64version21.1.0 + osx_64_cross_target_platformosx-64version21.1.2: + CONFIG: osx_64_cross_target_platformosx-64version21.1.2 UPLOAD_PACKAGES: 'True' osx_64_cross_target_platformosx-arm64version19.1.7: CONFIG: osx_64_cross_target_platformosx-arm64version19.1.7 @@ -23,8 +23,8 @@ jobs: osx_64_cross_target_platformosx-arm64version20.1.8: CONFIG: osx_64_cross_target_platformosx-arm64version20.1.8 UPLOAD_PACKAGES: 'True' - osx_64_cross_target_platformosx-arm64version21.1.0: - CONFIG: osx_64_cross_target_platformosx-arm64version21.1.0 + osx_64_cross_target_platformosx-arm64version21.1.2: + CONFIG: osx_64_cross_target_platformosx-arm64version21.1.2 UPLOAD_PACKAGES: 'True' osx_arm64_cross_target_platformosx-64version19.1.7: CONFIG: osx_arm64_cross_target_platformosx-64version19.1.7 @@ -32,8 +32,8 @@ jobs: osx_arm64_cross_target_platformosx-64version20.1.8: CONFIG: osx_arm64_cross_target_platformosx-64version20.1.8 UPLOAD_PACKAGES: 'True' - osx_arm64_cross_target_platformosx-64version21.1.0: - CONFIG: osx_arm64_cross_target_platformosx-64version21.1.0 + osx_arm64_cross_target_platformosx-64version21.1.2: + CONFIG: osx_arm64_cross_target_platformosx-64version21.1.2 UPLOAD_PACKAGES: 'True' osx_arm64_cross_target_platformosx-arm64version19.1.7: CONFIG: osx_arm64_cross_target_platformosx-arm64version19.1.7 @@ -41,8 +41,8 @@ jobs: osx_arm64_cross_target_platformosx-arm64version20.1.8: CONFIG: osx_arm64_cross_target_platformosx-arm64version20.1.8 UPLOAD_PACKAGES: 'True' - osx_arm64_cross_target_platformosx-arm64version21.1.0: - CONFIG: osx_arm64_cross_target_platformosx-arm64version21.1.0 + osx_arm64_cross_target_platformosx-arm64version21.1.2: + CONFIG: osx_arm64_cross_target_platformosx-arm64version21.1.2 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: {} diff --git a/.ci_support/linux_64_cross_target_platformosx-64version21.1.0.yaml b/.ci_support/linux_64_cross_target_platformosx-64version21.1.2.yaml similarity index 98% rename from .ci_support/linux_64_cross_target_platformosx-64version21.1.0.yaml rename to .ci_support/linux_64_cross_target_platformosx-64version21.1.2.yaml index 7536b5c8..7059a064 100644 --- a/.ci_support/linux_64_cross_target_platformosx-64version21.1.0.yaml +++ b/.ci_support/linux_64_cross_target_platformosx-64version21.1.2.yaml @@ -25,7 +25,7 @@ uname_kernel_release: uname_machine: - x86_64 version: -- 21.1.0 +- 21.1.2 zip_keys: - - cross_target_platform - macos_machine diff --git a/.ci_support/linux_64_cross_target_platformosx-arm64version21.1.0.yaml b/.ci_support/linux_64_cross_target_platformosx-arm64version21.1.2.yaml similarity index 98% rename from .ci_support/linux_64_cross_target_platformosx-arm64version21.1.0.yaml rename to .ci_support/linux_64_cross_target_platformosx-arm64version21.1.2.yaml index 88ec614f..daaf9758 100644 --- a/.ci_support/linux_64_cross_target_platformosx-arm64version21.1.0.yaml +++ b/.ci_support/linux_64_cross_target_platformosx-arm64version21.1.2.yaml @@ -25,7 +25,7 @@ uname_kernel_release: uname_machine: - arm64 version: -- 21.1.0 +- 21.1.2 zip_keys: - - cross_target_platform - macos_machine diff --git a/.ci_support/osx_64_cross_target_platformosx-64version21.1.0.yaml b/.ci_support/osx_64_cross_target_platformosx-64version21.1.2.yaml similarity index 98% rename from .ci_support/osx_64_cross_target_platformosx-64version21.1.0.yaml rename to .ci_support/osx_64_cross_target_platformosx-64version21.1.2.yaml index 77a95830..de8b4017 100644 --- a/.ci_support/osx_64_cross_target_platformosx-64version21.1.0.yaml +++ b/.ci_support/osx_64_cross_target_platformosx-64version21.1.2.yaml @@ -23,7 +23,7 @@ uname_kernel_release: uname_machine: - x86_64 version: -- 21.1.0 +- 21.1.2 zip_keys: - - cross_target_platform - macos_machine diff --git a/.ci_support/osx_64_cross_target_platformosx-arm64version21.1.0.yaml b/.ci_support/osx_64_cross_target_platformosx-arm64version21.1.2.yaml similarity index 98% rename from .ci_support/osx_64_cross_target_platformosx-arm64version21.1.0.yaml rename to .ci_support/osx_64_cross_target_platformosx-arm64version21.1.2.yaml index f150d844..99a04579 100644 --- a/.ci_support/osx_64_cross_target_platformosx-arm64version21.1.0.yaml +++ b/.ci_support/osx_64_cross_target_platformosx-arm64version21.1.2.yaml @@ -23,7 +23,7 @@ uname_kernel_release: uname_machine: - arm64 version: -- 21.1.0 +- 21.1.2 zip_keys: - - cross_target_platform - macos_machine diff --git a/.ci_support/osx_arm64_cross_target_platformosx-64version21.1.0.yaml b/.ci_support/osx_arm64_cross_target_platformosx-64version21.1.2.yaml similarity index 98% rename from .ci_support/osx_arm64_cross_target_platformosx-64version21.1.0.yaml rename to .ci_support/osx_arm64_cross_target_platformosx-64version21.1.2.yaml index 141542f2..e0d9138a 100644 --- a/.ci_support/osx_arm64_cross_target_platformosx-64version21.1.0.yaml +++ b/.ci_support/osx_arm64_cross_target_platformosx-64version21.1.2.yaml @@ -23,7 +23,7 @@ uname_kernel_release: uname_machine: - x86_64 version: -- 21.1.0 +- 21.1.2 zip_keys: - - cross_target_platform - macos_machine diff --git a/.ci_support/osx_arm64_cross_target_platformosx-arm64version21.1.0.yaml b/.ci_support/osx_arm64_cross_target_platformosx-arm64version21.1.2.yaml similarity index 98% rename from .ci_support/osx_arm64_cross_target_platformosx-arm64version21.1.0.yaml rename to .ci_support/osx_arm64_cross_target_platformosx-arm64version21.1.2.yaml index c423f69a..b67ce8e1 100644 --- a/.ci_support/osx_arm64_cross_target_platformosx-arm64version21.1.0.yaml +++ b/.ci_support/osx_arm64_cross_target_platformosx-arm64version21.1.2.yaml @@ -23,7 +23,7 @@ uname_kernel_release: uname_machine: - arm64 version: -- 21.1.0 +- 21.1.2 zip_keys: - - cross_target_platform - macos_machine diff --git a/README.md b/README.md index f6fcc908..2c01d04d 100644 --- a/README.md +++ b/README.md @@ -63,10 +63,10 @@ Current build status - linux_64_cross_target_platformosx-64version21.1.0 + linux_64_cross_target_platformosx-64version21.1.2 - variant + variant @@ -84,10 +84,10 @@ Current build status - linux_64_cross_target_platformosx-arm64version21.1.0 + linux_64_cross_target_platformosx-arm64version21.1.2 - variant + variant @@ -105,10 +105,10 @@ Current build status - osx_64_cross_target_platformosx-64version21.1.0 + osx_64_cross_target_platformosx-64version21.1.2 - variant + variant @@ -126,10 +126,10 @@ Current build status - osx_64_cross_target_platformosx-arm64version21.1.0 + osx_64_cross_target_platformosx-arm64version21.1.2 - variant + variant @@ -147,10 +147,10 @@ Current build status - osx_arm64_cross_target_platformosx-64version21.1.0 + osx_arm64_cross_target_platformosx-64version21.1.2 - variant + variant @@ -168,10 +168,10 @@ Current build status - osx_arm64_cross_target_platformosx-arm64version21.1.0 + osx_arm64_cross_target_platformosx-arm64version21.1.2 - variant + variant diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 48f18f1c..1e487138 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -9,7 +9,7 @@ MACOSX_DEPLOYMENT_TARGET: # [linux] - 10.9 # [linux] version: - - 21.1.0 + - 21.1.2 - 20.1.8 - 19.1.7 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 65dec19f..3a8f6d63 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% if version is not defined %} -{% set version = "21.1.0" %} +{% set version = "21.1.2" %} {% endif %} {% set major_ver = version.split(".")[0] %} # in the past we've had to uncouple the compiler version from the version