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

Jump to bottom

Bumps in garden: use ign-common5 #224

Merged
merged 4 commits into from
Dec 29, 2021
Merged

Bumps in garden: use ign-common5 #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
92f4434
Bumps in garden : ci_matching_branch/bump_garden_ign-fuel-tools8
chapulina Dec 27, 2021
3fec714
update tests
chapulina Dec 29, 2021
9660181
Windows tests
chapulina Dec 29, 2021
8fe711d
Fix ResultType tests
chapulina Dec 29, 2021
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
4 changes: 2 additions & 2 deletions .github/ci/packages.apt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ curl
libcurl4-openssl-dev
libgflags-dev
libignition-cmake2-dev
libignition-common4-dev
libignition-math6-dev
libignition-common5-dev
libignition-math7-dev
libignition-msgs9-dev
libignition-tools-dev
libjsoncpp-dev
Expand Down
8 changes: 4 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ ign_find_package(ZIP REQUIRED PRIVATE)

#--------------------------------------
# Find ignition-common
ign_find_package(ignition-common4 REQUIRED PRIVATE)
set(IGN_COMMON_MAJOR_VER ${ignition-common4_VERSION_MAJOR})
ign_find_package(ignition-common5 REQUIRED PRIVATE)
set(IGN_COMMON_MAJOR_VER ${ignition-common5_VERSION_MAJOR})

#--------------------------------------
# Find ignition-math
ign_find_package(ignition-math6 REQUIRED PRIVATE)
set(IGN_MSGS_MAJOR_VER ${ignition-math6_VERSION_MAJOR})
ign_find_package(ignition-math7 REQUIRED PRIVATE)
set(IGN_MSGS_MAJOR_VER ${ignition-math7_VERSION_MAJOR})

#--------------------------------------
# Find ignition-msgs
Expand Down
2 changes: 1 addition & 1 deletion src/ClientConfig_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ TEST(ServerConfig, Url)
// Trailing /
{
ServerConfig srv;
srv.SetUrl(common::URI("http://banana:8080/"));
srv.SetUrl(common::URI("http://banana:8080"));
EXPECT_EQ("http://banana:8080", srv.Url().Str());
EXPECT_EQ("http", srv.Url().Scheme());
EXPECT_EQ("banana:8080", srv.Url().Path().Str());
Expand Down
2 changes: 1 addition & 1 deletion src/CollectionIdentifier_TEST.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ TEST(CollectionIdentifier, SetFields)
TEST(CollectionIdentifier, UniqueName)
{
ignition::fuel_tools::ServerConfig srv1;
srv1.SetUrl(common::URI("https://localhost:8001/"));
srv1.SetUrl(common::URI("https://localhost:8001"));

ignition::fuel_tools::ServerConfig srv2;
srv2.SetUrl(common::URI("https://localhost:8002"));
Expand Down
Loading