From 1fd154ebb7f09933767a3487cf3efd20a3845bf6 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 22 Jan 2024 22:09:24 +0000 Subject: [PATCH 1/4] updated v10_10.1.0 --- recipe/meta.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f49e030..6439af4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set component_name = "msgs" %} {% set repo_name = "gz-" + component_name %} -{% set version = "10_10.0.0" %} +{% set version = "10_10.1.0" %} {% set major_version = version.split('_')[0] %} {% set version_package = version.split('_')[1] %} {% set name = repo_name + major_version %} @@ -15,7 +15,7 @@ package: source: - url: https://github.com/gazebosim/{{ repo_name }}/archive/{{ repo_name }}{{ version }}.tar.gz - sha256: 81afeb973252ffabcbab1372271efac2d3dbd52679916b495000215f43d54997 + sha256: 1150aa1818f7be5c61f773343c16bad1ff15052f36ff0d3efc157e380dd9a2ea patches: - 391.patch - 392.patch @@ -23,9 +23,9 @@ source: - 394.patch - win_enable_cmd_install.patch - win_enable_py_tests.patch - + build: - number: 4 + number: 0 outputs: - name: {{ cxx_name }} From ed9347b1aa17d550179e2cbdb2bce6c614b8567c Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Mon, 22 Jan 2024 22:09:30 +0000 Subject: [PATCH 2/4] MNT: Re-rendered with conda-build 3.28.4, conda-smithy 3.30.4, and conda-forge-pinning 2024.01.22.14.29.27 --- .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 eba1dfd..beda247 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -57,12 +57,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 From 4b34a1ebec538f3884594c3d058cbb0e04042924 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Mon, 22 Jan 2024 23:41:30 +0100 Subject: [PATCH 3/4] Update meta.yaml --- recipe/meta.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6439af4..bc9344e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,10 +17,6 @@ source: - url: https://github.com/gazebosim/{{ repo_name }}/archive/{{ repo_name }}{{ version }}.tar.gz sha256: 1150aa1818f7be5c61f773343c16bad1ff15052f36ff0d3efc157e380dd9a2ea patches: - - 391.patch - - 392.patch - - 393.patch - - 394.patch - win_enable_cmd_install.patch - win_enable_py_tests.patch From 9e3568d69518f6804ccaa968b5103243b985d47b Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Tue, 23 Jan 2024 00:22:58 +0100 Subject: [PATCH 4/4] Update meta.yaml --- recipe/meta.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index bc9344e..176513a 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -17,7 +17,6 @@ source: - url: https://github.com/gazebosim/{{ repo_name }}/archive/{{ repo_name }}{{ version }}.tar.gz sha256: 1150aa1818f7be5c61f773343c16bad1ff15052f36ff0d3efc157e380dd9a2ea patches: - - win_enable_cmd_install.patch - win_enable_py_tests.patch build: