Skip to content

Commit

Permalink
Remove Bionic from future releases (Garden+) (#878)
Browse files Browse the repository at this point in the history
* enable static checkers

Signed-off-by: Louise Poubel <[email protected]>

* Fix focal linting errors
* Fix whitespace

Signed-off-by: Steve Peters <[email protected]>
Co-authored-by: Steve Peters <[email protected]>
  • Loading branch information
chapulina and scpeters authored Mar 14, 2022
1 parent f174efc commit 1acea10
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 19 deletions.
11 changes: 2 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -28,3 +19,5 @@ jobs:
uses: ignition-tooling/action-ignition-ci@focal
with:
codecov-enabled: true
cppcheck-enabled: true
cpplint-enabled: true
2 changes: 1 addition & 1 deletion usd/include/sdf/usd/sdf_parser/Light.hh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include <string>

// 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.
Expand Down
2 changes: 1 addition & 1 deletion usd/include/sdf/usd/sdf_parser/World.hh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include <string>

// 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.
Expand Down
6 changes: 3 additions & 3 deletions usd/src/UsdTestUtils.hh
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,9 @@ void CheckInertial(const pxr::UsdPrim &_usdPrim,
EXPECT_EQ(_isRigid, _usdPrim.HasAPI<pxr::UsdPhysicsRigidBodyAPI>());
EXPECT_EQ(_isRigid, _usdPrim.HasAPI<pxr::UsdPhysicsMassAPI>());
}
} // namespace testing
} // namespace usd
} // namespace testing
} // namespace usd
}
} // namespace sdf
} // namespace sdf

#endif
5 changes: 3 additions & 2 deletions usd/src/sdf_parser/Link_Sdf2Usd_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#include <gtest/gtest.h>

// 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.
Expand Down Expand Up @@ -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),
Expand Down
6 changes: 4 additions & 2 deletions usd/src/sdf_parser/Sensors_Sdf2Usd_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion usd/src/sdf_parser/World_Sdf2Usd_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#include <gtest/gtest.h>

// 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.
Expand Down

0 comments on commit 1acea10

Please sign in to comment.