Merge 1 into 2

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
gazebosim · Jan 18, 2024 · 08d1e68 · 08d1e68
2 parents 6ccc53c + f835926
commit 08d1e68
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -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
@@ -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
diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml
@@ -14,4 +14,3 @@ jobs:
         with:
           project-url: https://github.com/orgs/gazebosim/projects/7
           github-token: ${{ secrets.TRIAGE_TOKEN }}
-
diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt
@@ -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)
@@ -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

diff --git a/register/CMakeLists.txt b/register/CMakeLists.txt
@@ -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)
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 }}