From 0b629712f8368dcdad591294b5ed67fafc4cc124 Mon Sep 17 00:00:00 2001 From: Jose Luis Rivero Date: Tue, 12 Sep 2023 13:47:53 +0200 Subject: [PATCH 1/2] Do not install CMakeLists.txt in loader/register (#123) * Do not install CMakeLists.txt in loader/register By including the installation of a whole directory in the source code for loader/register, the buildsystem is installing the CMakeLists.txt files that are included in these directories. Exclude them from the final installation by using the EXCLUDE clause in CMake. Signed-off-by: Jose Luis Rivero --- loader/CMakeLists.txt | 3 ++- register/CMakeLists.txt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt index 8da87c81..a4702204 100644 --- a/loader/CMakeLists.txt +++ b/loader/CMakeLists.txt @@ -54,7 +54,8 @@ endif() install( DIRECTORY include/ - DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}) + DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL} + PATTERN "CMakeLists.txt" EXCLUDE) #============================================================================ # ign command line support diff --git a/register/CMakeLists.txt b/register/CMakeLists.txt index 0b349215..43e50865 100644 --- a/register/CMakeLists.txt +++ b/register/CMakeLists.txt @@ -3,4 +3,5 @@ ign_add_component(register INTERFACE) install( DIRECTORY include/ - DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}) + DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL} + PATTERN "CMakeLists.txt" EXCLUDE) From f8359262a0e31d1c3866664f1276757928d08cc8 Mon Sep 17 00:00:00 2001 From: "Addisu Z. Taddese" Date: Mon, 13 Nov 2023 10:13:30 -0600 Subject: [PATCH 2/2] Update github action workflows (#132) * Use on `push` only on stable branches to avoid duplicate runs * Update project automation Signed-off-by: Addisu Z. Taddese --- .github/workflows/ci.yml | 14 ++++++++++---- .github/workflows/triage.yml | 9 +++------ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9b79d00b..f40d3f21 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,6 +1,12 @@ name: Ubuntu CI -on: [push, pull_request] +on: + pull_request: + push: + branches: + - 'ign-plugin[0-9]' + - 'gz-plugin[0-9]' + - 'main' jobs: bionic-ci: @@ -8,7 +14,7 @@ jobs: name: Ubuntu Bionic CI steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Compile and test id: ci uses: ignition-tooling/action-ignition-ci@bionic @@ -20,7 +26,7 @@ jobs: name: Ubuntu Focal CI steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Compile and test id: ci uses: ignition-tooling/action-ignition-ci@focal @@ -29,7 +35,7 @@ jobs: name: Ubuntu Jammy CI steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Compile and test id: ci uses: ignition-tooling/action-ignition-ci@jammy diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml index 736670e0..2332244b 100644 --- a/.github/workflows/triage.yml +++ b/.github/workflows/triage.yml @@ -10,10 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Add ticket to inbox - uses: technote-space/create-project-card-action@v1 + uses: actions/add-to-project@v0.5.0 with: - PROJECT: Core development - COLUMN: Inbox - GITHUB_TOKEN: ${{ secrets.TRIAGE_TOKEN }} - CHECK_ORG_PROJECT: true - + project-url: https://github.com/orgs/gazebosim/projects/7 + github-token: ${{ secrets.TRIAGE_TOKEN }}