Skip to content

Commit

Permalink
Port: 7 to main (#2023)
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
  • Loading branch information
mjcarroll committed Jul 20, 2023
2 parents 309906a + ee24a50 commit 3ea40b2
Show file tree
Hide file tree
Showing 210 changed files with 20,716 additions and 1,274 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@
examples/* @mabelzhang
src/systems/physics/* @azeey
src/systems/sensors/* @iche033
*/gui/* @jennuine
tutorials/* @mabelzhang
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: Ubuntu Focal CI
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- uses: actions/setup-python@v3
- uses: pre-commit/action@v3.0.0
with:
Expand All @@ -25,7 +25,7 @@ jobs:
name: Ubuntu Jammy CI
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
- uses: actions/setup-python@v3
- uses: pre-commit/action@v3.0.0
with:
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
rev: v4.4.0
hooks:
- id: check-added-large-files
args: ['--maxkb=500']
Expand Down
11 changes: 5 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})

#--------------------------------------
# Find gz-transport
gz_find_package(gz-transport13 REQUIRED COMPONENTS log)
gz_find_package(gz-transport13 REQUIRED COMPONENTS log parameters)
set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR})

#--------------------------------------
Expand Down Expand Up @@ -134,6 +134,7 @@ gz_find_package(gz-sensors8 REQUIRED
COMPONENTS
# non-rendering
air_pressure
air_speed
altimeter
imu
force_torque
Expand Down Expand Up @@ -187,12 +188,10 @@ set(GZ_UTILS_VER ${gz-utils2_VERSION_MAJOR})

#--------------------------------------
# Find protobuf
set(REQ_PROTOBUF_VER 3)
gz_find_package(GzProtobuf
VERSION ${REQ_PROTOBUF_VER}
REQUIRED
COMPONENTS all
PRETTY Protobuf)
REQUIRED
COMPONENTS all
PRETTY Protobuf)
set(Protobuf_IMPORT_DIRS ${gz-msgs10_INCLUDE_DIRS})

#--------------------------------------
Expand Down
176 changes: 0 additions & 176 deletions COPYING

This file was deleted.

Loading

0 comments on commit 3ea40b2

Please sign in to comment.