From 450b3635dd66cc61cb06d1ad513d540cc571003b Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 18 Jul 2024 10:01:56 +0000 Subject: [PATCH 1/3] Rebuild for harfbuzz 9 --- .ci_support/migrations/harfbuzz9.yaml | 8 ++++++++ recipe/meta.yaml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/harfbuzz9.yaml diff --git a/.ci_support/migrations/harfbuzz9.yaml b/.ci_support/migrations/harfbuzz9.yaml new file mode 100644 index 0000000..0216ea6 --- /dev/null +++ b/.ci_support/migrations/harfbuzz9.yaml @@ -0,0 +1,8 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for harfbuzz 9 + kind: version + migration_number: 1 +harfbuzz: +- '9' +migrator_ts: 1719592972.538086 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index ef8d5e9..7c82b51 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -20,7 +20,7 @@ source: - no-module-warning.patch build: - number: 0 + number: 1 requirements: build: From 0f4b9edbbca75a8fb1080802b37a89569f572677 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 18 Jul 2024 10:02:55 +0000 Subject: [PATCH 2/3] MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.37.1, and conda-forge-pinning 2024.07.18.05.06.15 --- .ci_support/linux_64_.yaml | 4 ++-- .ci_support/linux_aarch64_.yaml | 4 ++-- .ci_support/linux_ppc64le_.yaml | 4 ++-- .ci_support/osx_64_.yaml | 4 ++-- .ci_support/osx_arm64_.yaml | 4 ++-- .ci_support/win_64_.yaml | 4 ++-- .scripts/build_steps.sh | 10 ++++++++-- 7 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index a87ab8b..29b2431 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -23,9 +23,9 @@ gdk_pixbuf: glib: - '2' harfbuzz: -- '8' +- '9' pango: -- '1.50' +- '1' target_platform: - linux-64 zip_keys: diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index 898ea3f..1c951de 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -27,9 +27,9 @@ gdk_pixbuf: glib: - '2' harfbuzz: -- '8' +- '9' pango: -- '1.50' +- '1' target_platform: - linux-aarch64 zip_keys: diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index d9cbc16..a745108 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -23,9 +23,9 @@ gdk_pixbuf: glib: - '2' harfbuzz: -- '8' +- '9' pango: -- '1.50' +- '1' target_platform: - linux-ppc64le zip_keys: diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml index c70fbaa..de543bd 100644 --- a/.ci_support/osx_64_.yaml +++ b/.ci_support/osx_64_.yaml @@ -21,10 +21,10 @@ gdk_pixbuf: glib: - '2' harfbuzz: -- '8' +- '9' macos_machine: - x86_64-apple-darwin13.4.0 pango: -- '1.50' +- '1' target_platform: - osx-64 diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml index 7c38753..04281a0 100644 --- a/.ci_support/osx_arm64_.yaml +++ b/.ci_support/osx_arm64_.yaml @@ -21,10 +21,10 @@ gdk_pixbuf: glib: - '2' harfbuzz: -- '8' +- '9' macos_machine: - arm64-apple-darwin20.0.0 pango: -- '1.50' +- '1' target_platform: - osx-arm64 diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml index 210998e..30405bd 100644 --- a/.ci_support/win_64_.yaml +++ b/.ci_support/win_64_.yaml @@ -13,10 +13,10 @@ gdk_pixbuf: glib: - '2' harfbuzz: -- '8' +- '9' libiconv: - '1' pango: -- '1.50' +- '1' target_platform: - win-64 diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 6be9d51..8159453 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -43,6 +43,12 @@ setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" source run_conda_forge_build_setup +( +# Due to https://bugzilla.redhat.com/show_bug.cgi?id=1537564 old versions of rpm +# are drastically slowed down when the number of file descriptors is very high. +# This can be visible during a `yum install` step of a feedstock build. +# => Set a lower limit in a subshell for the `yum install`s only. +ulimit -n 1024 # Install the yum requirements defined canonically in the # "recipe/yum_requirements.txt" file. After updating that file, @@ -51,7 +57,8 @@ source run_conda_forge_build_setup /usr/bin/sudo -n yum install -y xorg-x11-server-Xvfb -# make the build number clobber + +)# make the build number clobber make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" if [[ "${HOST_PLATFORM}" != "${BUILD_PLATFORM}" ]] && [[ "${HOST_PLATFORM}" != linux-* ]] && [[ "${BUILD_WITH_CONDA_DEBUG:-0}" != 1 ]]; then @@ -80,7 +87,6 @@ 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 From 95403891369fbc46003749768a2d36bf136bd36f Mon Sep 17 00:00:00 2001 From: Mark Harfouche Date: Thu, 18 Jul 2024 07:32:02 -0400 Subject: [PATCH 3/3] remove --buildtype argument --- recipe/build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/build.sh b/recipe/build.sh index 1966ceb..43869b2 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -71,7 +71,6 @@ fi meson setup builddir \ ${MESON_ARGS} \ "${meson_config_args[@]}" \ - --buildtype=release \ --prefix=$PREFIX \ -Dlibdir=lib \ --wrap-mode=nofallback \