From 95767d7d7e1c0363b648ed92961d064634879766 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 16 Oct 2024 11:00:33 +1100 Subject: [PATCH 1/2] LLVM v19.1.2 --- recipe/conda_build_config.yaml | 2 +- recipe/meta.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index aeee603..aabcfb0 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -11,7 +11,7 @@ MACOSX_DEPLOYMENT_TARGET: # [linux] version: - 17.0.6 - 18.1.8 - - 19.1.1 + - 19.1.2 # everything below is zipped cross_target_platform: diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cce0843..5d2b826 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% if version is not defined %} -{% set version = "19.1.0" %} +{% set version = "19.1.2" %} {% endif %} {% set major_ver = version.split(".")[0] %} # in the past we've had to uncouple the compiler version from the version From d02c9bbe1de7a6df831c29af22b9cc55aaceb554 Mon Sep 17 00:00:00 2001 From: "H. Vetinari" Date: Wed, 16 Oct 2024 11:03:20 +1100 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.42.2, and conda-forge-pinning 2024.10.15.19.09.52 --- .azure-pipelines/azure-pipelines-linux.yml | 8 +++---- .azure-pipelines/azure-pipelines-osx.yml | 16 ++++++------- ...6_64-apple-darwin13.4.0version19.1.2.yaml} | 2 +- ...rm64-apple-darwin20.0.0version19.1.2.yaml} | 2 +- ...6_64-apple-darwin13.4.0version19.1.2.yaml} | 2 +- ...rm64-apple-darwin20.0.0version19.1.2.yaml} | 2 +- ...6_64-apple-darwin13.4.0version19.1.2.yaml} | 2 +- ...rm64-apple-darwin20.0.0version19.1.2.yaml} | 2 +- .scripts/build_steps.sh | 4 ++-- .scripts/run_osx_build.sh | 4 ++-- README.md | 24 +++++++++---------- azure-pipelines.yml | 1 - 12 files changed, 34 insertions(+), 35 deletions(-) rename .ci_support/{linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1.yaml => linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.2.yaml} (98%) rename .ci_support/{linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1.yaml => linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.2.yaml} (98%) rename .ci_support/{osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1.yaml => osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.2.yaml} (98%) rename .ci_support/{osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1.yaml => osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.2.yaml} (98%) rename .ci_support/{osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1.yaml => osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.2.yaml} (98%) rename .ci_support/{osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1.yaml => osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.2.yaml} (98%) diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 4cdfd62..81964f1 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-64macos_machinex86_64-apple-darwin13.4.0version18.1.8 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1: - CONFIG: linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1 + linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.2: + CONFIG: linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.2 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6: @@ -28,8 +28,8 @@ jobs: CONFIG: linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.8 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1: - CONFIG: linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1 + linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.2: + CONFIG: linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.2 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 9a66f3e..19130b0 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -14,8 +14,8 @@ jobs: osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.8: CONFIG: osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.8 UPLOAD_PACKAGES: 'True' - osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1: - CONFIG: osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1 + osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.2: + CONFIG: osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.2 UPLOAD_PACKAGES: 'True' osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6: CONFIG: osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6 @@ -23,8 +23,8 @@ jobs: osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.8: CONFIG: osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.8 UPLOAD_PACKAGES: 'True' - osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1: - CONFIG: osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1 + osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.2: + CONFIG: osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.2 UPLOAD_PACKAGES: 'True' osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6: CONFIG: osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version17.0.6 @@ -32,8 +32,8 @@ jobs: osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.8: CONFIG: osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version18.1.8 UPLOAD_PACKAGES: 'True' - osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1: - CONFIG: osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1 + osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.2: + CONFIG: osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.2 UPLOAD_PACKAGES: 'True' osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6: CONFIG: osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version17.0.6 @@ -41,8 +41,8 @@ jobs: osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.8: CONFIG: osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version18.1.8 UPLOAD_PACKAGES: 'True' - osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1: - CONFIG: osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1 + osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.2: + CONFIG: osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.2 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: {} diff --git a/.ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1.yaml b/.ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.2.yaml similarity index 98% rename from .ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1.yaml rename to .ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.2.yaml index 3b1bb29..adcf58e 100644 --- a/.ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1.yaml +++ b/.ci_support/linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.2.yaml @@ -25,7 +25,7 @@ uname_kernel_release: uname_machine: - x86_64 version: -- 19.1.1 +- 19.1.2 zip_keys: - - cross_target_platform - macos_machine diff --git a/.ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1.yaml b/.ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.2.yaml similarity index 98% rename from .ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1.yaml rename to .ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.2.yaml index e06e8ce..5d93745 100644 --- a/.ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1.yaml +++ b/.ci_support/linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.2.yaml @@ -25,7 +25,7 @@ uname_kernel_release: uname_machine: - arm64 version: -- 19.1.1 +- 19.1.2 zip_keys: - - cross_target_platform - macos_machine diff --git a/.ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1.yaml b/.ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.2.yaml similarity index 98% rename from .ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1.yaml rename to .ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.2.yaml index 99dda06..ce5f036 100644 --- a/.ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1.yaml +++ b/.ci_support/osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.2.yaml @@ -23,7 +23,7 @@ uname_kernel_release: uname_machine: - x86_64 version: -- 19.1.1 +- 19.1.2 zip_keys: - - cross_target_platform - macos_machine diff --git a/.ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1.yaml b/.ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.2.yaml similarity index 98% rename from .ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1.yaml rename to .ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.2.yaml index 08348c2..c221c96 100644 --- a/.ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1.yaml +++ b/.ci_support/osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.2.yaml @@ -23,7 +23,7 @@ uname_kernel_release: uname_machine: - arm64 version: -- 19.1.1 +- 19.1.2 zip_keys: - - cross_target_platform - macos_machine diff --git a/.ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1.yaml b/.ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.2.yaml similarity index 98% rename from .ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1.yaml rename to .ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.2.yaml index 5858597..c6b19b9 100644 --- a/.ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1.yaml +++ b/.ci_support/osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.2.yaml @@ -23,7 +23,7 @@ uname_kernel_release: uname_machine: - x86_64 version: -- 19.1.1 +- 19.1.2 zip_keys: - - cross_target_platform - macos_machine diff --git a/.ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1.yaml b/.ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.2.yaml similarity index 98% rename from .ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1.yaml rename to .ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.2.yaml index 6ea6156..2af03cb 100644 --- a/.ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1.yaml +++ b/.ci_support/osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.2.yaml @@ -23,7 +23,7 @@ uname_kernel_release: uname_machine: - arm64 version: -- 19.1.1 +- 19.1.2 zip_keys: - - cross_target_platform - macos_machine diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 856f469..12647a5 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -76,8 +76,8 @@ else --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}" ( startgroup "Inspecting artifacts" ) 2> /dev/null - # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 - command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir "${RECIPE_ROOT}" -m "${CONFIG_FILE}" || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 420f051..dfef5ae 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -88,8 +88,8 @@ else ( startgroup "Inspecting artifacts" ) 2> /dev/null - # inspect_artifacts was only added in conda-forge-ci-setup 4.6.0 - command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts || echo "inspect_artifacts needs conda-forge-ci-setup >=4.6.0" + # inspect_artifacts was only added in conda-forge-ci-setup 4.9.4 + command -v inspect_artifacts >/dev/null 2>&1 && inspect_artifacts --recipe-dir ./recipe -m ./.ci_support/${CONFIG}.yaml || echo "inspect_artifacts needs conda-forge-ci-setup >=4.9.4" ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null diff --git a/README.md b/README.md index 46686c6..6296832 100644 --- a/README.md +++ b/README.md @@ -63,10 +63,10 @@ Current build status - linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1 + linux_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.2 - variant + variant @@ -84,10 +84,10 @@ Current build status - linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1 + linux_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.2 - variant + variant @@ -105,10 +105,10 @@ Current build status - osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1 + osx_64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.2 - variant + variant @@ -126,10 +126,10 @@ Current build status - osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1 + osx_64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.2 - variant + variant @@ -147,10 +147,10 @@ Current build status - osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.1 + osx_arm64_cross_target_platformosx-64macos_machinex86_64-apple-darwin13.4.0version19.1.2 - variant + variant @@ -168,10 +168,10 @@ Current build status - osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.1 + osx_arm64_cross_target_platformosx-arm64macos_machinearm64-apple-darwin20.0.0version19.1.2 - variant + variant diff --git a/azure-pipelines.yml b/azure-pipelines.yml index f37c093..67d82fa 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -13,7 +13,6 @@ stages: RET: 'true' steps: - checkout: self - fetchDepth: '2' - bash: | git_log=`git log --max-count=1 --skip=1 --pretty=format:"%B" | tr "\n" " "`