Skip to content

Commit

Permalink
Merge pull request #22 from regro-cf-autotick-bot/8_8.0.0_ha320a2
Browse files Browse the repository at this point in the history
[bot-automerge] gz-sensors v8_8.0.0
  • Loading branch information
traversaro committed Oct 10, 2023
2 parents 6eab175 + 1c6ec3e commit de5de8c
Show file tree
Hide file tree
Showing 10 changed files with 42 additions and 33 deletions.
7 changes: 0 additions & 7 deletions .ci_support/migrations/libarchive37.yaml

This file was deleted.

4 changes: 2 additions & 2 deletions .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
- '16'
libabseil:
- '20230802'
libarchive:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ MACOSX_DEPLOYMENT_TARGET:
c_compiler:
- clang
c_compiler_version:
- '15'
- '16'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
- '16'
libabseil:
- '20230802'
libarchive:
Expand Down
10 changes: 9 additions & 1 deletion .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 13 additions & 13 deletions README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions conda-forge.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
bot:
abi_migration_branches:
- 'v7'
automerge: true
build_platform:
linux_aarch64: linux_64
Expand Down
2 changes: 1 addition & 1 deletion recipe/build_cxx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ if [[ "${CONDA_BUILD_CROSS_COMPILATION:-}" != "1" ]]; then
if [[ ${HOST} =~ .*darwin.* ]]; then
ctest -VV --output-on-failure -C Release -E "UNIT_Lidar_TEST|UNIT_Camera_TEST|INTEGRATION"
else
ctest -VV --output-on-failure -C Release
ctest -VV --output-on-failure -C Release -E "INTEGRATION_dvl"
fi
fi
12 changes: 6 additions & 6 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% set component_name = "sensors" %}
{% set repo_name = "gz-" + component_name %}
{% set version = "7_7.3.0" %}
{% set version = "8_8.0.0" %}
{% set major_version = version.split('_')[0] %}
{% set version_package = version.split('_')[1] %}
{% set name = repo_name + major_version %}
Expand All @@ -13,7 +13,7 @@ package:

source:
- url: https://github.com/gazebosim/{{ repo_name }}/archive/{{ repo_name }}{{ version }}.tar.gz
sha256: 91d6d72fc110f77374f211af0edc8c3d4a0fc355969aba76b789afcbd1328930
sha256: f86d6572f31efc199a623462faaa1b380c91a3706a60561aa498562aa939184e

build:
number: 0
Expand All @@ -38,11 +38,11 @@ outputs:
- libprotobuf
- libgz-math7
- libgz-common5
- libgz-transport12
- libgz-rendering7
- libgz-msgs9
- libgz-transport13
- libgz-rendering8
- libgz-msgs10
- libgz-plugin2
- libsdformat13
- libsdformat14
- libarchive # [osx]
- ogre 1.10.*
test:
Expand Down
6 changes: 6 additions & 0 deletions recipe/yum_requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
mesa-libGL
mesa-dri-drivers
libselinux
libXdamage
libXxf86vm
libXext

0 comments on commit de5de8c

Please sign in to comment.