From 13b1ac7353f361c25f654b3b240443d4b1bc8ed3 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 4 Jul 2024 11:45:15 +0000 Subject: [PATCH 1/2] Rebuild for libhwloc 2.11.0 --- .ci_support/migrations/libhwloc2110.yaml | 8 ++++++++ recipe/meta.yaml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libhwloc2110.yaml diff --git a/.ci_support/migrations/libhwloc2110.yaml b/.ci_support/migrations/libhwloc2110.yaml new file mode 100644 index 0000000..f82784e --- /dev/null +++ b/.ci_support/migrations/libhwloc2110.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for libhwloc 2.11.0 + kind: version + migration_number: 1 +libhwloc: +- 2.11.0 +migrator_ts: 1719349281.82988 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 145ccd7..c6e6b0b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,7 @@ source: - centos6.patch # This patch can be removed once the conda-forge reference is updated build: - number: 1 + number: 2 skip: true # [not linux] run_exports: - {{ pin_subpackage('flux-core', max_pin='x.x') }} From b3a6f3e24bea9f84c19b90d751fffb4984d1aa00 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 4 Jul 2024 11:46:40 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and conda-forge-pinning 2024.07.04.09.14.11 --- .ci_support/linux_64_mpimpichpython3.10.____cpython.yaml | 6 +++--- .ci_support/linux_64_mpimpichpython3.11.____cpython.yaml | 6 +++--- .ci_support/linux_64_mpimpichpython3.12.____cpython.yaml | 6 +++--- .ci_support/linux_64_mpimpichpython3.8.____cpython.yaml | 6 +++--- .ci_support/linux_64_mpimpichpython3.9.____cpython.yaml | 6 +++--- .../linux_64_mpiopenmpipython3.10.____cpython.yaml | 6 +++--- .../linux_64_mpiopenmpipython3.11.____cpython.yaml | 6 +++--- .../linux_64_mpiopenmpipython3.12.____cpython.yaml | 6 +++--- .ci_support/linux_64_mpiopenmpipython3.8.____cpython.yaml | 6 +++--- .ci_support/linux_64_mpiopenmpipython3.9.____cpython.yaml | 6 +++--- .ci_support/migrations/libhwloc2100.yaml | 8 -------- .scripts/build_steps.sh | 7 +++++++ 12 files changed, 37 insertions(+), 38 deletions(-) delete mode 100644 .ci_support/migrations/libhwloc2100.yaml diff --git a/.ci_support/linux_64_mpimpichpython3.10.____cpython.yaml b/.ci_support/linux_64_mpimpichpython3.10.____cpython.yaml index 17037fb..5c327ab 100644 --- a/.ci_support/linux_64_mpimpichpython3.10.____cpython.yaml +++ b/.ci_support/linux_64_mpimpichpython3.10.____cpython.yaml @@ -5,9 +5,9 @@ c_compiler_version: c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -17,7 +17,7 @@ docker_image: libarchive: - '3.7' libhwloc: -- 2.10.0 +- 2.11.0 libuuid: - '2' lua: diff --git a/.ci_support/linux_64_mpimpichpython3.11.____cpython.yaml b/.ci_support/linux_64_mpimpichpython3.11.____cpython.yaml index 3c2c96f..ea94c65 100644 --- a/.ci_support/linux_64_mpimpichpython3.11.____cpython.yaml +++ b/.ci_support/linux_64_mpimpichpython3.11.____cpython.yaml @@ -5,9 +5,9 @@ c_compiler_version: c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -17,7 +17,7 @@ docker_image: libarchive: - '3.7' libhwloc: -- 2.10.0 +- 2.11.0 libuuid: - '2' lua: diff --git a/.ci_support/linux_64_mpimpichpython3.12.____cpython.yaml b/.ci_support/linux_64_mpimpichpython3.12.____cpython.yaml index db08a79..946cf0f 100644 --- a/.ci_support/linux_64_mpimpichpython3.12.____cpython.yaml +++ b/.ci_support/linux_64_mpimpichpython3.12.____cpython.yaml @@ -5,9 +5,9 @@ c_compiler_version: c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -17,7 +17,7 @@ docker_image: libarchive: - '3.7' libhwloc: -- 2.10.0 +- 2.11.0 libuuid: - '2' lua: diff --git a/.ci_support/linux_64_mpimpichpython3.8.____cpython.yaml b/.ci_support/linux_64_mpimpichpython3.8.____cpython.yaml index 7ccea8a..d9d79a2 100644 --- a/.ci_support/linux_64_mpimpichpython3.8.____cpython.yaml +++ b/.ci_support/linux_64_mpimpichpython3.8.____cpython.yaml @@ -5,9 +5,9 @@ c_compiler_version: c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -17,7 +17,7 @@ docker_image: libarchive: - '3.7' libhwloc: -- 2.10.0 +- 2.11.0 libuuid: - '2' lua: diff --git a/.ci_support/linux_64_mpimpichpython3.9.____cpython.yaml b/.ci_support/linux_64_mpimpichpython3.9.____cpython.yaml index 47d931c..a93eb7e 100644 --- a/.ci_support/linux_64_mpimpichpython3.9.____cpython.yaml +++ b/.ci_support/linux_64_mpimpichpython3.9.____cpython.yaml @@ -5,9 +5,9 @@ c_compiler_version: c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -17,7 +17,7 @@ docker_image: libarchive: - '3.7' libhwloc: -- 2.10.0 +- 2.11.0 libuuid: - '2' lua: diff --git a/.ci_support/linux_64_mpiopenmpipython3.10.____cpython.yaml b/.ci_support/linux_64_mpiopenmpipython3.10.____cpython.yaml index 0ff047c..5846f48 100644 --- a/.ci_support/linux_64_mpiopenmpipython3.10.____cpython.yaml +++ b/.ci_support/linux_64_mpiopenmpipython3.10.____cpython.yaml @@ -5,9 +5,9 @@ c_compiler_version: c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -17,7 +17,7 @@ docker_image: libarchive: - '3.7' libhwloc: -- 2.10.0 +- 2.11.0 libuuid: - '2' lua: diff --git a/.ci_support/linux_64_mpiopenmpipython3.11.____cpython.yaml b/.ci_support/linux_64_mpiopenmpipython3.11.____cpython.yaml index d821369..1da860b 100644 --- a/.ci_support/linux_64_mpiopenmpipython3.11.____cpython.yaml +++ b/.ci_support/linux_64_mpiopenmpipython3.11.____cpython.yaml @@ -5,9 +5,9 @@ c_compiler_version: c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -17,7 +17,7 @@ docker_image: libarchive: - '3.7' libhwloc: -- 2.10.0 +- 2.11.0 libuuid: - '2' lua: diff --git a/.ci_support/linux_64_mpiopenmpipython3.12.____cpython.yaml b/.ci_support/linux_64_mpiopenmpipython3.12.____cpython.yaml index 795cbb7..72e7fab 100644 --- a/.ci_support/linux_64_mpiopenmpipython3.12.____cpython.yaml +++ b/.ci_support/linux_64_mpiopenmpipython3.12.____cpython.yaml @@ -5,9 +5,9 @@ c_compiler_version: c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -17,7 +17,7 @@ docker_image: libarchive: - '3.7' libhwloc: -- 2.10.0 +- 2.11.0 libuuid: - '2' lua: diff --git a/.ci_support/linux_64_mpiopenmpipython3.8.____cpython.yaml b/.ci_support/linux_64_mpiopenmpipython3.8.____cpython.yaml index ca40548..da391c9 100644 --- a/.ci_support/linux_64_mpiopenmpipython3.8.____cpython.yaml +++ b/.ci_support/linux_64_mpiopenmpipython3.8.____cpython.yaml @@ -5,9 +5,9 @@ c_compiler_version: c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -17,7 +17,7 @@ docker_image: libarchive: - '3.7' libhwloc: -- 2.10.0 +- 2.11.0 libuuid: - '2' lua: diff --git a/.ci_support/linux_64_mpiopenmpipython3.9.____cpython.yaml b/.ci_support/linux_64_mpiopenmpipython3.9.____cpython.yaml index f7a7327..a8563e8 100644 --- a/.ci_support/linux_64_mpiopenmpipython3.9.____cpython.yaml +++ b/.ci_support/linux_64_mpiopenmpipython3.9.____cpython.yaml @@ -5,9 +5,9 @@ c_compiler_version: c_stdlib: - sysroot c_stdlib_version: -- '2.12' +- '2.17' cdt_name: -- cos6 +- cos7 channel_sources: - conda-forge channel_targets: @@ -17,7 +17,7 @@ docker_image: libarchive: - '3.7' libhwloc: -- 2.10.0 +- 2.11.0 libuuid: - '2' lua: diff --git a/.ci_support/migrations/libhwloc2100.yaml b/.ci_support/migrations/libhwloc2100.yaml deleted file mode 100644 index 98ba179..0000000 --- a/.ci_support/migrations/libhwloc2100.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for libhwloc 2.10.0 - kind: version - migration_number: 1 -libhwloc: -- 2.10.0 -migrator_ts: 1711507406.8423882 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 2f3df6c..97dc8d9 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -69,6 +69,13 @@ else --suppress-variables ${EXTRA_CB_OPTIONS:-} \ --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \ --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" + + ( endgroup "Inspecting artifacts" ) 2> /dev/null ( startgroup "Validating outputs" ) 2> /dev/null validate_recipe_outputs "${FEEDSTOCK_NAME}"