From 161e5a94a824c2db512f463b249b6fddf7a8c475 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 16 Nov 2024 05:14:11 +0000 Subject: [PATCH 1/2] updated v15.1.1 --- recipe/meta.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 8a4432b..22cfcfd 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set repo_name = "sdformat" %} -{% set version = "15.0.0" %} +{% set version = "15.1.1" %} {% set major_version = version.split('.')[0] %} {% set name = repo_name + major_version %} {% set cxx_name = "lib" + name %} @@ -11,13 +11,13 @@ package: source: - url: https://github.com/osrf/sdformat/archive/sdformat{{ major_version }}_{{ version }}.tar.gz - sha256: 2b21c1efe7c4bb817a5867b80974c7e35cfdd863b4024fe94a3bcb1d6a05a813 + sha256: 9c9b517b390fe6965f76775db67f406b42948ebac433f87fadc680467d45184a patches: - standalone_bindings.patch - standalone_bindings_tests.patch build: - number: 1 + number: 0 outputs: From 5584e1dfcb2bdc7bf837d1f17e9f56bc2088121c Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 16 Nov 2024 05:15:07 +0000 Subject: [PATCH 2/2] MNT: Re-rendered with conda-build 24.9.0, conda-smithy 3.44.4, and conda-forge-pinning 2024.11.15.15.57.58 --- .ci_support/linux_64_.yaml | 4 +--- .ci_support/linux_aarch64_.yaml | 4 +--- .ci_support/linux_ppc64le_.yaml | 4 +--- .scripts/run_osx_build.sh | 2 +- .scripts/run_win_build.bat | 7 ++++--- 5 files changed, 8 insertions(+), 13 deletions(-) diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml index dab5bed..6fb6143 100644 --- a/.ci_support/linux_64_.yaml +++ b/.ci_support/linux_64_.yaml @@ -7,7 +7,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -39,5 +39,3 @@ urdfdom: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml index fb2f5c7..5b2a1df 100644 --- a/.ci_support/linux_aarch64_.yaml +++ b/.ci_support/linux_aarch64_.yaml @@ -11,7 +11,7 @@ c_stdlib_version: cdt_arch: - aarch64 cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -43,5 +43,3 @@ urdfdom: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name diff --git a/.ci_support/linux_ppc64le_.yaml b/.ci_support/linux_ppc64le_.yaml index ece3b83..7a4b35d 100644 --- a/.ci_support/linux_ppc64le_.yaml +++ b/.ci_support/linux_ppc64le_.yaml @@ -7,7 +7,7 @@ c_stdlib: c_stdlib_version: - '2.17' cdt_name: -- cos7 +- conda channel_sources: - conda-forge channel_targets: @@ -39,5 +39,3 @@ urdfdom: zip_keys: - - c_compiler_version - cxx_compiler_version -- - c_stdlib_version - - cdt_name diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 7f948c4..0b36498 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -33,7 +33,7 @@ rm -rf "${MAMBA_ROOT_PREFIX}" "${micromamba_exe}" || true ( endgroup "Provisioning base env with micromamba" ) 2> /dev/null ( startgroup "Configuring conda" ) 2> /dev/null - +echo "Activating environment" source "${MINIFORGE_HOME}/etc/profile.d/conda.sh" conda activate base export CONDA_SOLVER="libmamba" diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat index 12db999..3aaf80c 100755 --- a/.scripts/run_win_build.bat +++ b/.scripts/run_win_build.bat @@ -12,6 +12,7 @@ setlocal enableextensions enabledelayedexpansion +FOR %%A IN ("%~dp0.") DO SET "REPO_ROOT=%%~dpA" if "%MINIFORGE_HOME%"=="" set "MINIFORGE_HOME=%USERPROFILE%\Miniforge3" :: Remove trailing backslash, if present if "%MINIFORGE_HOME:~-1%"=="\" set "MINIFORGE_HOME=%MINIFORGE_HOME:~0,-1%" @@ -33,13 +34,13 @@ call "%MICROMAMBA_EXE%" create --yes --root-prefix "%MAMBA_ROOT_PREFIX%" --prefi pip python=3.12 conda-build conda-forge-ci-setup=4 "conda-build>=24.1" if !errorlevel! neq 0 exit /b !errorlevel! echo Removing %MAMBA_ROOT_PREFIX% -del /S /Q "%MAMBA_ROOT_PREFIX%" -del /S /Q "%MICROMAMBA_TMPDIR%" -call :end_group +del /S /Q "%MAMBA_ROOT_PREFIX%" >nul +del /S /Q "%MICROMAMBA_TMPDIR%" >nul call :start_group "Configuring conda" :: Activate the base conda environment +echo Activating environment call "%MINIFORGE_HOME%\Scripts\activate.bat" :: Configure the solver set "CONDA_SOLVER=libmamba"