Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Ubuntu 24.04 in Github Actions CI workflow #427

Merged
merged 5 commits into from
Aug 1, 2024
Merged

Use Ubuntu 24.04 in Github Actions CI workflow #427

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
65d493a
Use Ubuntu 24.04 in Github Actions CI workflow
azeey Jul 19, 2024
7157514
Fix cpplint errors
azeey Jul 19, 2024
8933a58
Disable codecov for now since it doesn't work on this repo
azeey Jul 30, 2024
85e4178
Keep Jammy CI, but enable codecov
azeey Jul 31, 2024
8227ff4
Actually enable codecov
azeey Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,16 @@ on:
- 'main'

jobs:
jammy-ci:
noble-ci:
runs-on: ubuntu-latest
name: Ubuntu Jammy CI
name: Ubuntu Noble CI
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

most of the other packages have added Noble CI alongside Jammy. Should we be disabling that?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we don't have codecov working in Noble, perhaps we should leave Jammy in for now. Otherwise, I don't think there's a need to keep Jammy.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added jammy back in 85e4178 with codecov enabled.

steps:
- name: Checkout
uses: actions/checkout@v4
- name: Compile and test
id: ci
uses: gazebo-tooling/action-gz-ci@jammy
uses: gazebo-tooling/action-gz-ci@noble
with:
codecov-enabled: false
cppcheck-enabled: true
cpplint-enabled: true
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
Build | Status
-- | --
Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-fuel-tools/tree/main/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-fuel-tools/tree/main)
Ubuntu Jammy | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_fuel_tools-ci-main-jammy-amd64)](https://build.osrfoundation.org/job/gz_fuel_tools-ci-main-jammy-amd64)
Ubuntu Noble | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_fuel_tools-ci-main-noble-amd64)](https://build.osrfoundation.org/job/gz_fuel_tools-ci-main-noble-amd64)
Homebrew | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_fuel_tools-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/gz_fuel_tools-ci-main-homebrew-amd64)
Windows | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_fuel_tools-main-win)](https://build.osrfoundation.org/job/gz_fuel_tools-main-win/)

Expand Down
14 changes: 9 additions & 5 deletions src/FuelClient_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,8 @@ TEST_F(FuelClientTest, CachedModel)

// Cached model (tip)
{
common::URI url{"http://localhost:8007/1.0/alice/models/My Model/tip", true};
common::URI url{"http://localhost:8007/1.0/alice/models/My Model/tip",
true};
std::string path;
auto result = client.CachedModel(url, path);
EXPECT_TRUE(result);
Expand All @@ -744,7 +745,8 @@ TEST_F(FuelClientTest, CachedModel)
// Cached model file (tip)
{
common::URI url{
"http://localhost:8007/1.0/alice/models/My Model/tip/files/model.sdf", true};
"http://localhost:8007/1.0/alice/models/My Model/tip/files/model.sdf",
true};
std::string path;
auto result = client.CachedModelFile(url, path);
EXPECT_TRUE(result);
Expand Down Expand Up @@ -776,7 +778,8 @@ TEST_F(FuelClientTest, CachedModel)

// Non-cached model (when looking for file)
{
common::URI url{"http://localhost:8007/1.0/alice/models/Banana/model.sdf", true};
common::URI url{"http://localhost:8007/1.0/alice/models/Banana/model.sdf",
true};
std::string path;
auto result = client.CachedModelFile(url, path);
EXPECT_FALSE(result);
Expand Down Expand Up @@ -1186,7 +1189,8 @@ TEST_F(FuelClientTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(CachedWorld))

// Cached world (tip)
{
common::URI url{"http://localhost:8007/1.0/banana/worlds/My World/tip", true};
common::URI url{"http://localhost:8007/1.0/banana/worlds/My World/tip",
true};
std::string path;
auto result = client.CachedWorld(url, path);
EXPECT_TRUE(result);
Expand Down Expand Up @@ -1516,7 +1520,7 @@ TEST_F(FuelClientTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(PatchModelFail))

// Bad model.config
result = client.PatchModel(modelId, headers,
common::joinPaths(common::cwd(), "test_cache",
common::joinPaths(common::cwd(), "test_cache",
sanitizeAuthority("localhost:8007"),
"alice", "models", "My Model", "3"));
EXPECT_EQ(ResultType::UPLOAD_ERROR, result.Type());
Expand Down
4 changes: 2 additions & 2 deletions src/LocalCache.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ Model LocalCache::MatchingModel(const ModelIdentifier &_id)
this->dataPtr->config->CacheLocation(), uriToPath(_id.Server().Url()));

auto srvModels = this->dataPtr->ModelsInServer(path);
for (auto &model: srvModels)
for (auto &model : srvModels)
{
model.dataPtr->id.SetServer(_id.Server());
auto id = model.Identification();
Expand Down Expand Up @@ -316,7 +316,7 @@ bool LocalCache::MatchingWorld(WorldIdentifier &_id) const
this->dataPtr->config->CacheLocation(), uriToPath(_id.Server().Url()));

auto srvWorlds = this->dataPtr->WorldsInServer(path);
for (auto id: srvWorlds)
for (auto id : srvWorlds)
{
id.SetServer(_id.Server());
if (_id == id)
Expand Down