-
Notifications
You must be signed in to change notification settings - Fork 3.4k
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.
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
Replace Travis with Github Actions for CI builds #6071
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,10 +5,8 @@ | |
#include "util/log.hpp" | ||
|
||
#include <boost/algorithm/string/predicate.hpp> | ||
#include <boost/algorithm/string/regex.hpp> | ||
#include <boost/optional/optional.hpp> | ||
#include <boost/ref.hpp> | ||
#include <boost/regex.hpp> | ||
|
||
#include <osmium/osm.hpp> | ||
#include <osmium/tags/regex_filter.hpp> | ||
|
@@ -244,14 +242,15 @@ bool RestrictionParser::ShouldIgnoreRestriction(const std::string &except_tag_st | |
|
||
// Be warned, this is quadratic work here, but we assume that | ||
// only a few exceptions are actually defined. | ||
std::vector<std::string> exceptions; | ||
boost::algorithm::split_regex(exceptions, except_tag_string, boost::regex("[;][ ]*")); | ||
const std::regex delimiter_re("[;][ ]*"); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Similar problem to the Travis Xenial upgrade attempt. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nice! |
||
std::sregex_token_iterator except_tags_begin( | ||
except_tag_string.begin(), except_tag_string.end(), delimiter_re, -1); | ||
std::sregex_token_iterator except_tags_end; | ||
|
||
return std::any_of( | ||
std::begin(exceptions), std::end(exceptions), [&](const std::string ¤t_string) { | ||
return std::end(restrictions) != | ||
std::find(std::begin(restrictions), std::end(restrictions), current_string); | ||
}); | ||
return std::any_of(except_tags_begin, except_tags_end, [&](const std::string ¤t_string) { | ||
return std::end(restrictions) != | ||
std::find(std::begin(restrictions), std::end(restrictions), current_string); | ||
}); | ||
} | ||
} // namespace extractor | ||
} // namespace osrm |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,7 +6,6 @@ | |
#include "engine/api/json_factory.hpp" | ||
#include "osrm/coordinate.hpp" | ||
|
||
#include <iterator> | ||
#include <vector> | ||
|
||
using namespace osrm; | ||
|
@@ -27,7 +26,7 @@ BOOST_AUTO_TEST_CASE(test_json_linestring) | |
const auto coords = geom.values["coordinates"].get<util::json::Array>().values; | ||
BOOST_CHECK_EQUAL(coords.size(), 3); // array of three location arrays | ||
|
||
for (const auto each : coords) | ||
for (const auto &each : coords) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Unit test changes are due to compiler errors from updated macOS clang. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This crashes clang? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Running
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ah I see |
||
{ | ||
const auto loc = each.get<util::json::Array>().values; | ||
BOOST_CHECK_EQUAL(loc.size(), 2); | ||
|
@@ -53,7 +52,7 @@ BOOST_AUTO_TEST_CASE(test_json_single_point) | |
const auto coords = geom.values["coordinates"].get<util::json::Array>().values; | ||
BOOST_CHECK_EQUAL(coords.size(), 2); // array of two location arrays | ||
|
||
for (const auto each : coords) | ||
for (const auto &each : coords) | ||
{ | ||
const auto loc = each.get<util::json::Array>().values; | ||
BOOST_CHECK_EQUAL(loc.size(), 2); | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -184,7 +184,7 @@ BOOST_AUTO_TEST_CASE(test_match_fb_serialization) | |
const auto matchings = fb->routes(); | ||
const auto &number_of_matchings = matchings->size(); | ||
|
||
for (const auto &waypoint : *waypoints) | ||
for (const auto waypoint : *waypoints) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Also clang-related? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes, similar errors to above: https://github.com/mjjbell/osrm-backend/runs/2957246502?check_suite_focus=true#step:15:2784
|
||
{ | ||
BOOST_CHECK(waypoint_check(waypoint)); | ||
const auto matchings_index = waypoint->matchings_index(); | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On Travis Trusty builds, the compilers all had
GLIBCXX_USE_CXX11_ABI=0
by default. This setting has been flipped in Bionic, so we need to explicitly pass this to pkg-config so that the example builds.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I forgot why we had this in the first place. I think this was mason related given that is afaik the only place where we care about ABI of our binaries.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep, the Mason Boosts are built against the old ABI .