From 7c5229e1192f9b44a56fddf75c5108d8750b9848 Mon Sep 17 00:00:00 2001 From: Sebastian Castro <4603398+sea-bass@users.noreply.github.com> Date: Mon, 30 Sep 2024 21:40:53 -0400 Subject: [PATCH 1/5] Update urdf/model.h -> urdf/model.hpp --- include/srdfdom/model.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/srdfdom/model.h b/include/srdfdom/model.h index f52dbb5..0d5535c 100644 --- a/include/srdfdom/model.h +++ b/include/srdfdom/model.h @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include From 888475dd2e5942818b2f52a518d6c3a6009965f9 Mon Sep 17 00:00:00 2001 From: Sebastian Castro Date: Tue, 1 Oct 2024 08:40:36 -0400 Subject: [PATCH 2/5] Add repo branch and Jazzy to CI action --- .github/workflows/industrial_ci_action.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/industrial_ci_action.yml b/.github/workflows/industrial_ci_action.yml index 096b7bd..2e549b5 100644 --- a/.github/workflows/industrial_ci_action.yml +++ b/.github/workflows/industrial_ci_action.yml @@ -16,18 +16,20 @@ jobs: matrix: env: - { - ROS_DISTRO: iron, ROS_REPO: main, CCOV_UPLOAD: true, + ROS_DISTRO: jazzy, ROS_REPO: main, REPO_BRANCH: jazzy, CCOV_UPLOAD: true, CLANG_TIDY: pedantic, CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS='--coverage' -DCMAKE_CXX_FLAGS='--coverage'", AFTER_RUN_TARGET_TEST: './.ci.prepare_codecov', ADDITIONAL_DEBS: 'lcov' } - - {ROS_DISTRO: iron, ROS_REPO: main, CCOV_UPLOAD: false} - - {ROS_DISTRO: iron, ROS_REPO: testing, CCOV_UPLOAD: false} - - {ROS_DISTRO: humble, ROS_REPO: main, CCOV_UPLOAD: false} - - {ROS_DISTRO: humble, ROS_REPO: testing, CCOV_UPLOAD: false} - - {ROS_DISTRO: rolling, ROS_REPO: main, CCOV_UPLOAD: false} - - {ROS_DISTRO: rolling, ROS_REPO: testing, CCOV_UPLOAD: false} + - {ROS_DISTRO: humble, ROS_REPO: main, REPO_BRANCH: humble, CCOV_UPLOAD: false} + - {ROS_DISTRO: humble, ROS_REPO: testing, REPO_BRANCH: humble, CCOV_UPLOAD: false} + - {ROS_DISTRO: iron, ROS_REPO: main, REPO_BRANCH: iron, CCOV_UPLOAD: false} + - {ROS_DISTRO: iron, ROS_REPO: testing, REPO_BRANCH: iron, CCOV_UPLOAD: false} + - {ROS_DISTRO: jazzy, ROS_REPO: main, REPO_BRANCH: jazzy, CCOV_UPLOAD: false} + - {ROS_DISTRO: jazzy, ROS_REPO: testing, REPO_BRANCH: jazzy, CCOV_UPLOAD: false} + - {ROS_DISTRO: rolling, ROS_REPO: main, REPO_BRANCH: ros2, CCOV_UPLOAD: false} + - {ROS_DISTRO: rolling, ROS_REPO: testing, REPO_BRANCH: ros2, CCOV_UPLOAD: false} env: CCACHE_DIR: /home/runner/.ccache BASEDIR: .base @@ -37,6 +39,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + with: + ref: ${{ matrix.env.REPO_BRANCH }} - uses: actions/cache@v4 with: path: ${{ env.CCACHE_DIR }} From 5c83f9b9b76928c3ec2ed5b9a9d38ae183a9f7da Mon Sep 17 00:00:00 2001 From: Sebastian Castro Date: Tue, 1 Oct 2024 08:50:46 -0400 Subject: [PATCH 3/5] Use current branch in rolling --- .github/workflows/industrial_ci_action.yml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/industrial_ci_action.yml b/.github/workflows/industrial_ci_action.yml index 2e549b5..88ee441 100644 --- a/.github/workflows/industrial_ci_action.yml +++ b/.github/workflows/industrial_ci_action.yml @@ -22,14 +22,14 @@ jobs: AFTER_RUN_TARGET_TEST: './.ci.prepare_codecov', ADDITIONAL_DEBS: 'lcov' } - - {ROS_DISTRO: humble, ROS_REPO: main, REPO_BRANCH: humble, CCOV_UPLOAD: false} - - {ROS_DISTRO: humble, ROS_REPO: testing, REPO_BRANCH: humble, CCOV_UPLOAD: false} - - {ROS_DISTRO: iron, ROS_REPO: main, REPO_BRANCH: iron, CCOV_UPLOAD: false} - - {ROS_DISTRO: iron, ROS_REPO: testing, REPO_BRANCH: iron, CCOV_UPLOAD: false} - - {ROS_DISTRO: jazzy, ROS_REPO: main, REPO_BRANCH: jazzy, CCOV_UPLOAD: false} - - {ROS_DISTRO: jazzy, ROS_REPO: testing, REPO_BRANCH: jazzy, CCOV_UPLOAD: false} - - {ROS_DISTRO: rolling, ROS_REPO: main, REPO_BRANCH: ros2, CCOV_UPLOAD: false} - - {ROS_DISTRO: rolling, ROS_REPO: testing, REPO_BRANCH: ros2, CCOV_UPLOAD: false} + - {ROS_DISTRO: humble, ROS_REPO: main, CCOV_UPLOAD: false} + - {ROS_DISTRO: humble, ROS_REPO: testing, CCOV_UPLOAD: false} + - {ROS_DISTRO: iron, ROS_REPO: main, CCOV_UPLOAD: false} + - {ROS_DISTRO: iron, ROS_REPO: testing, CCOV_UPLOAD: false} + - {ROS_DISTRO: jazzy, ROS_REPO: main, CCOV_UPLOAD: false} + - {ROS_DISTRO: jazzy, ROS_REPO: testing, CCOV_UPLOAD: false} + - {ROS_DISTRO: rolling, ROS_REPO: main, CCOV_UPLOAD: false} + - {ROS_DISTRO: rolling, ROS_REPO: testing, CCOV_UPLOAD: false} env: CCACHE_DIR: /home/runner/.ccache BASEDIR: .base @@ -39,8 +39,11 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + if: ${{ matrix.env.ROS_DISTRO != 'rolling' }} with: - ref: ${{ matrix.env.REPO_BRANCH }} + ref: ${{ matrix.env.ROS_DISTRO }} + - uses: actions/checkout@v4 + if: ${{ matrix.env.ROS_DISTRO == 'rolling' }} - uses: actions/cache@v4 with: path: ${{ env.CCACHE_DIR }} From c2ad5697a9d26e086c6e32dc883f298ba6adfd66 Mon Sep 17 00:00:00 2001 From: Sebastian Castro Date: Wed, 2 Oct 2024 08:23:45 -0400 Subject: [PATCH 4/5] Switch to __has_include preprocessor operator --- .github/workflows/industrial_ci_action.yml | 5 ----- include/srdfdom/model.h | 7 ++++++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/industrial_ci_action.yml b/.github/workflows/industrial_ci_action.yml index 88ee441..98b9cd0 100644 --- a/.github/workflows/industrial_ci_action.yml +++ b/.github/workflows/industrial_ci_action.yml @@ -39,11 +39,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - if: ${{ matrix.env.ROS_DISTRO != 'rolling' }} - with: - ref: ${{ matrix.env.ROS_DISTRO }} - - uses: actions/checkout@v4 - if: ${{ matrix.env.ROS_DISTRO == 'rolling' }} - uses: actions/cache@v4 with: path: ${{ env.CCACHE_DIR }} diff --git a/include/srdfdom/model.h b/include/srdfdom/model.h index 0d5535c..e86510c 100644 --- a/include/srdfdom/model.h +++ b/include/srdfdom/model.h @@ -41,10 +41,15 @@ #include #include #include -#include #include #include +#if __has_include() +#include +#else +#include +#endif + #include "visibility_control.h" /// Main namespace From 766c8e73235d5dda6a998e4463b5d0ab31aacebb Mon Sep 17 00:00:00 2001 From: Sebastian Castro Date: Wed, 2 Oct 2024 08:30:43 -0400 Subject: [PATCH 5/5] Remove CI changes from here --- .github/workflows/industrial_ci_action.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/industrial_ci_action.yml b/.github/workflows/industrial_ci_action.yml index 98b9cd0..096b7bd 100644 --- a/.github/workflows/industrial_ci_action.yml +++ b/.github/workflows/industrial_ci_action.yml @@ -16,18 +16,16 @@ jobs: matrix: env: - { - ROS_DISTRO: jazzy, ROS_REPO: main, REPO_BRANCH: jazzy, CCOV_UPLOAD: true, + ROS_DISTRO: iron, ROS_REPO: main, CCOV_UPLOAD: true, CLANG_TIDY: pedantic, CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS='--coverage' -DCMAKE_CXX_FLAGS='--coverage'", AFTER_RUN_TARGET_TEST: './.ci.prepare_codecov', ADDITIONAL_DEBS: 'lcov' } - - {ROS_DISTRO: humble, ROS_REPO: main, CCOV_UPLOAD: false} - - {ROS_DISTRO: humble, ROS_REPO: testing, CCOV_UPLOAD: false} - {ROS_DISTRO: iron, ROS_REPO: main, CCOV_UPLOAD: false} - {ROS_DISTRO: iron, ROS_REPO: testing, CCOV_UPLOAD: false} - - {ROS_DISTRO: jazzy, ROS_REPO: main, CCOV_UPLOAD: false} - - {ROS_DISTRO: jazzy, ROS_REPO: testing, CCOV_UPLOAD: false} + - {ROS_DISTRO: humble, ROS_REPO: main, CCOV_UPLOAD: false} + - {ROS_DISTRO: humble, ROS_REPO: testing, CCOV_UPLOAD: false} - {ROS_DISTRO: rolling, ROS_REPO: main, CCOV_UPLOAD: false} - {ROS_DISTRO: rolling, ROS_REPO: testing, CCOV_UPLOAD: false} env: