From 363e1af3b2545046e5bcab57208e87a73c8c1b41 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Fri, 11 Mar 2022 12:06:19 -0800 Subject: [PATCH 1/4] Remove Bionic from future releases (Garden+) Signed-off-by: Louise Poubel --- .github/workflows/ci.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cb66f564a..8ac7d1592 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,15 +3,6 @@ name: Ubuntu on: [push, pull_request] jobs: - bionic-ci: - runs-on: ubuntu-latest - name: Ubuntu Bionic CI - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Compile and test - id: ci - uses: ignition-tooling/action-ignition-ci@bionic focal-ci: runs-on: ubuntu-latest name: Ubuntu Focal CI From 9aa412da37ebedca3492a81b0b74e1a70743062d Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Fri, 11 Mar 2022 14:17:24 -0800 Subject: [PATCH 2/4] enable static checkers Signed-off-by: Louise Poubel --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8ac7d1592..26bd9f069 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,3 +19,5 @@ jobs: uses: ignition-tooling/action-ignition-ci@focal with: codecov-enabled: true + cppcheck-enabled: true + cpplint-enabled: true From 01cd327c28c37d3e6a6202dfeec94e4d964f4a44 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Sun, 13 Mar 2022 21:25:27 -0700 Subject: [PATCH 3/4] Fix focal linting errors Signed-off-by: Steve Peters --- usd/include/sdf/usd/sdf_parser/Light.hh | 2 +- usd/include/sdf/usd/sdf_parser/World.hh | 2 +- usd/src/sdf_parser/Link_Sdf2Usd_TEST.cc | 5 +++-- usd/src/sdf_parser/Sensors_Sdf2Usd_TEST.cc | 6 ++++-- usd/src/sdf_parser/World_Sdf2Usd_TEST.cc | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/usd/include/sdf/usd/sdf_parser/Light.hh b/usd/include/sdf/usd/sdf_parser/Light.hh index f56d4cf26..697116032 100644 --- a/usd/include/sdf/usd/sdf_parser/Light.hh +++ b/usd/include/sdf/usd/sdf_parser/Light.hh @@ -20,7 +20,7 @@ #include -// TODO(adlarkin):this is to remove deprecated "warnings" in usd, these warnings +// TODO(adlarkin) this is to remove deprecated "warnings" in usd, these warnings // are reported using #pragma message so normal diagnostic flags cannot remove // them. This workaround requires this block to be used whenever usd is // included. diff --git a/usd/include/sdf/usd/sdf_parser/World.hh b/usd/include/sdf/usd/sdf_parser/World.hh index d6675d7d3..0e9b0d332 100644 --- a/usd/include/sdf/usd/sdf_parser/World.hh +++ b/usd/include/sdf/usd/sdf_parser/World.hh @@ -20,7 +20,7 @@ #include -// TODO(ahcorde):this is to remove deprecated "warnings" in usd, these warnings +// TODO(ahcorde) this is to remove deprecated "warnings" in usd, these warnings // are reported using #pragma message so normal diagnostic flags cannot remove // them. This workaround requires this block to be used whenever usd is // included. diff --git a/usd/src/sdf_parser/Link_Sdf2Usd_TEST.cc b/usd/src/sdf_parser/Link_Sdf2Usd_TEST.cc index 7919f25cc..2d0d995cb 100644 --- a/usd/src/sdf_parser/Link_Sdf2Usd_TEST.cc +++ b/usd/src/sdf_parser/Link_Sdf2Usd_TEST.cc @@ -19,7 +19,7 @@ #include -// TODO(ahcorde):this is to remove deprecated "warnings" in usd, these warnings +// TODO(ahcorde) this is to remove deprecated "warnings" in usd, these warnings // are reported using #pragma message so normal diagnostic flags cannot remove // them. This workaround requires this block to be used whenever usd is // included. @@ -121,7 +121,8 @@ TEST_F(UsdStageFixture, Link) ignition::math::Vector3d(2, 0, 2.5), ignition::math::Quaterniond(0, 0, 0))); std::string cylinderLinkPath = cylinderPath + "/" + "link"; - auto cylinderLink = this->stage->GetPrimAtPath(pxr::SdfPath(cylinderLinkPath)); + auto cylinderLink = + this->stage->GetPrimAtPath(pxr::SdfPath(cylinderLinkPath)); ASSERT_TRUE(cylinderLink); sdf::usd::testing::CheckInertial( cylinderLink, 1, pxr::GfVec3f(1, 1, 1), pxr::GfQuatf(1, 0, 0, 0), diff --git a/usd/src/sdf_parser/Sensors_Sdf2Usd_TEST.cc b/usd/src/sdf_parser/Sensors_Sdf2Usd_TEST.cc index 4eefdf32e..69efde0fd 100644 --- a/usd/src/sdf_parser/Sensors_Sdf2Usd_TEST.cc +++ b/usd/src/sdf_parser/Sensors_Sdf2Usd_TEST.cc @@ -107,9 +107,11 @@ TEST_F(UsdStageFixture, Sensors) lidarSensor.GetAttribute(pxr::TfToken("minRange")).Get(&minRange); lidarSensor.GetAttribute(pxr::TfToken("maxRange")).Get(&maxRange); lidarSensor.GetAttribute(pxr::TfToken("horizontalFov")).Get(&hFOV); - lidarSensor.GetAttribute(pxr::TfToken("horizontalResolution")).Get(&hResolution); + lidarSensor.GetAttribute( + pxr::TfToken("horizontalResolution")).Get(&hResolution); lidarSensor.GetAttribute(pxr::TfToken("verticalFov")).Get(&vFOV); - lidarSensor.GetAttribute(pxr::TfToken("verticalResolution")).Get(&vResolution); + lidarSensor.GetAttribute( + pxr::TfToken("verticalResolution")).Get(&vResolution); EXPECT_FLOAT_EQ(10.0f, maxRange); EXPECT_FLOAT_EQ(0.08f, minRange); EXPECT_FLOAT_EQ(159.99995f, hFOV); diff --git a/usd/src/sdf_parser/World_Sdf2Usd_TEST.cc b/usd/src/sdf_parser/World_Sdf2Usd_TEST.cc index 189276456..3c6e35e2b 100644 --- a/usd/src/sdf_parser/World_Sdf2Usd_TEST.cc +++ b/usd/src/sdf_parser/World_Sdf2Usd_TEST.cc @@ -19,7 +19,7 @@ #include -// TODO(ahcorde):this is to remove deprecated "warnings" in usd, these warnings +// TODO(ahcorde) this is to remove deprecated "warnings" in usd, these warnings // are reported using #pragma message so normal diagnostic flags cannot remove // them. This workaround requires this block to be used whenever usd is // included. From f96865eb17c1665d3123121fcccb2aea1c3443a9 Mon Sep 17 00:00:00 2001 From: Steve Peters Date: Mon, 14 Mar 2022 00:03:20 -0700 Subject: [PATCH 4/4] Fix whitespace Signed-off-by: Steve Peters --- usd/src/UsdTestUtils.hh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usd/src/UsdTestUtils.hh b/usd/src/UsdTestUtils.hh index 3224d76cd..d9156277d 100644 --- a/usd/src/UsdTestUtils.hh +++ b/usd/src/UsdTestUtils.hh @@ -227,9 +227,9 @@ void CheckInertial(const pxr::UsdPrim &_usdPrim, EXPECT_EQ(_isRigid, _usdPrim.HasAPI()); EXPECT_EQ(_isRigid, _usdPrim.HasAPI()); } -} // namespace testing -} // namespace usd +} // namespace testing +} // namespace usd } -} // namespace sdf +} // namespace sdf #endif