From 3ccb6802f38f1e7420dd0a7619893a24bff32084 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 18 Jan 2024 07:51:25 +0000 Subject: [PATCH 1/2] updated v3.24.40 --- recipe/meta.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a491f2b..38466f4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,8 +1,9 @@ +{% set vs_major = "0.0" %} # Prior to conda-forge, Copyright 2014-2019 Peter Williams and collaborators. # This file is licensed under a 3-clause BSD license; see LICENSE.txt. {% set name = "gtk+" %} -{% set version = "3.24.39" %} +{% set version = "3.24.40" %} {% set version_majmin = '.'.join(version.split('.', 2)[:2]) %} package: @@ -11,7 +12,7 @@ package: source: url: https://download.gnome.org/sources/{{ name }}/{{ version_majmin }}/{{ name }}-{{ version }}.tar.xz - sha256: 1cac3e566b9b2f3653a458c08c2dcdfdca9f908037ac03c9d8564b4295778d79 + sha256: 444dbb11f4fd5d592d74422441671854d1b744d0a7f3a3fbf9d4f936eb0552d3 patches: - m_pi.patch - no-module-warning.patch From dbd5dfe7766c33b9b7bbcc8031a48869660408b6 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Thu, 18 Jan 2024 07:51:38 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 3.28.3, conda-smithy 3.30.4, and conda-forge-pinning 2024.01.18.06.29.38 --- .gitignore | 13 ++++++++++++- .scripts/build_steps.sh | 6 ------ .scripts/run_docker_build.sh | 6 ++++++ 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index c002910..179afe5 100644 --- a/.gitignore +++ b/.gitignore @@ -3,11 +3,22 @@ # Everything else is managed by the conda-smithy rerender process. # Please do not modify +# Ignore all files and folders in root * !/conda-forge.yml -!/*/ +# Don't ignore any files/folders if the parent folder is 'un-ignored' +# This also avoids warnings when adding an already-checked file with an ignored parent. +!/**/ +# Don't ignore any files/folders recursively in the following folders !/recipe/** !/.ci_support/** +# Since we ignore files/folders recursively, any folders inside +# build_artifacts gets ignored which trips some build systems. +# To avoid that we 'un-ignore' all files/folders recursively +# and only ignore the root build_artifacts folder. +!/build_artifacts/** +/build_artifacts + *.pyc diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 549d158..44f1618 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -65,12 +65,6 @@ if [[ -f "${FEEDSTOCK_ROOT}/LICENSE.txt" ]]; then cp "${FEEDSTOCK_ROOT}/LICENSE.txt" "${RECIPE_ROOT}/recipe-scripts-license.txt" fi -if [[ "${sha:-}" == "" ]]; then - pushd ${FEEDSTOCK_ROOT} - sha=$(git rev-parse HEAD) - popd -fi - if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then if [[ "x${BUILD_OUTPUT_ID:-}" != "x" ]]; then EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --output-id ${BUILD_OUTPUT_ID}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index b70ef01..00f377a 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -21,6 +21,12 @@ if [ -z ${FEEDSTOCK_NAME} ]; then export FEEDSTOCK_NAME=$(basename ${FEEDSTOCK_ROOT}) fi +if [[ "${sha:-}" == "" ]]; then + pushd "${FEEDSTOCK_ROOT}" + sha=$(git rev-parse HEAD) + popd +fi + docker info # In order for the conda-build process in the container to write to the mounted