Skip to content

Commit

Permalink
Merge pull request #136 from azeey/1_to_2
Browse files Browse the repository at this point in the history
Merge ign-plugin1 ➡️  gz-plugin2
  • Loading branch information
azeey authored Jan 18, 2024
2 parents 6ccc53c + 08d1e68 commit e90a00e
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 6 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
name: Ubuntu CI

on: [push, pull_request]
on:
pull_request:
push:
branches:
- 'ign-plugin[0-9]'
- 'gz-plugin[0-9]'
- 'main'

jobs:
focal-ci:
runs-on: ubuntu-latest
name: Ubuntu Focal CI
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Compile and test
id: ci
uses: gazebo-tooling/action-gz-ci@focal
Expand All @@ -22,7 +28,7 @@ jobs:
name: Ubuntu Jammy CI
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Compile and test
id: ci
uses: gazebo-tooling/action-gz-ci@jammy
1 change: 0 additions & 1 deletion .github/workflows/triage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ jobs:
with:
project-url: https://github.com/orgs/gazebosim/projects/7
github-token: ${{ secrets.TRIAGE_TOKEN }}

4 changes: 3 additions & 1 deletion loader/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

# Collect source files into the "sources" variable and unit test files into the
# "tests" variable
gz_get_libsources_and_unittests(sources tests)
Expand Down Expand Up @@ -53,7 +54,8 @@ endif()

install(
DIRECTORY include/
DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL})
DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL}
PATTERN "CMakeLists.txt" EXCLUDE)

#============================================================================
# gz command line support
Expand Down
3 changes: 2 additions & 1 deletion register/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ gz_add_component(register INTERFACE)

install(
DIRECTORY include/
DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL})
DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL}
PATTERN "CMakeLists.txt" EXCLUDE)

0 comments on commit e90a00e

Please sign in to comment.