gz-common v6.0.0 (#46)

automerged PR by conda-forge/automerge-action
conda-forge · Sep 29, 2024 · dec1451 · dec1451
2 parents 05705dc + d3d74e9
commit dec1451
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 110 deletions.
diff --git a/README.md b/README.md
diff --git a/conda-forge.yml b/conda-forge.yml
@@ -12,3 +12,7 @@ provider:
   linux_aarch64: default
   linux_ppc64le: default
 test: native_and_emulated
+bot:
+  abi_migration_branches:
+  - v5
+  automerge: true
diff --git a/recipe/641.patch b/recipe/641.patch
diff --git a/recipe/apple_disable_profiler_error_test.patch b/recipe/apple_disable_profiler_error_test.patch
diff --git a/recipe/bld_cxx.bat b/recipe/bld_cxx.bat
@@ -3,6 +3,7 @@ cd build
 
 cmake ^
     -G "Ninja" ^
+    -DBUILD_TESTING:BOOL=ON ^
     -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^
     -DCMAKE_BUILD_TYPE=Release ^
     -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=True ^
@@ -20,5 +21,5 @@ cmake --build . --config Release --target install
 if errorlevel 1 exit 1
 
 :: Test.
-ctest --output-on-failure -C Release
+ctest --output-on-failure -C Release -E "PERFORMANCE_|SignalHandler"
 if errorlevel 1 exit 1
diff --git a/recipe/build_cxx.sh b/recipe/build_cxx.sh
@@ -31,7 +31,8 @@ cmake --build . --config Release ${NUM_PARALLEL}
 cmake --build . --config Release --target install ${NUM_PARALLEL}
 
 if [[ "${CONDA_BUILD_CROSS_COMPILATION:-}" != "1" || "${CROSSCOMPILING_EMULATOR}" != "" ]]; then
-  # PERFORMANCE_plugin_specialization  is a performance test, let's disable it as we can't do 
-  # any expectation of the speed of the CI machines
-  ctest --output-on-failure -C Release -E PERFORMANCE_plugin_specialization 
+  # PERFORMANCE_* are performance tests, let's disable them as we can't assume 
+  # anything related to the speed of the CI machines
+  # SignalHandler disabled due to https://github.com/gazebosim/gz-common/issues/644#issuecomment-2381358169
+  ctest --output-on-failure -C Release -E "PERFORMANCE_|SignalHandler"
 fi
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,6 +1,6 @@
 {% set repo_name = "gz-common" %}
 {% set component_name = repo_name.split('-')[1] %}
-{% set version = "5.6.0" %}
+{% set version = "6.0.0" %}
 {% set major_version = version.split('.')[0] %}
 {% set name = repo_name + major_version %}
 {% set component_version = component_name + major_version %}
@@ -12,15 +12,13 @@ package:
 
 source:
   - url: https://github.com/gazebosim/{{ repo_name }}/archive/{{ repo_name }}{{ major_version }}_{{ version }}.tar.gz
-    sha256: 39d02930638c5da35bbdd4925385bfe10180a8166c9c649b8ae67e083a47130e
+    sha256: 13eb0ea1cd756c17cf399afacaf4b704dcf9f4f20512e1a4f5504fe4a5bd1f61
     patches:
       - librt_linkage.patch  # [linux]
       - macro_path_binary_relocation.patch
-      - apple_disable_profiler_error_test.patch
-      - 641.patch
 
 build:
-  number: 7
+  number: 0
 
 outputs:
   - name: {{ cxx_name }}
@@ -38,15 +36,15 @@ outputs:
         - cmake
         - pkg-config
       host:
-        - libgz-math7
-        - libgz-cmake3
-        - libgz-utils2
+        - libgz-math8
+        - libgz-cmake4
+        - libgz-utils3
+        # Transitive dependency of libgz-utils3
+        - spdlog
         - dlfcn-win32  # [win]
         - libuuid      # [linux]
         - freeimage
-        - gts
         - tinyxml2
-        - glib
         - ffmpeg
         - libgdal
         - assimp
@@ -113,7 +111,7 @@ about:
     * `{{ name }}`: Meta-package that depends on `{{ cxx_name }}`.
 
     If you need to depend at build time on the C++ package, please depend on `{{ cxx_name }}` in your recipe.
-    
+
 extra:
   feedstock-name: {{ repo_name }}
   recipe-maintainers: