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.

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

CI: pin ubuntu runner to 20.04 to avoid sanitizer failures #767

Merged
merged 4 commits into from
Mar 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/workflows/module_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
# The type of runner that the job will run on
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
os: [ubuntu-20.04, macos-latest]
fail-fast: false
runs-on: ${{ matrix.os }}

Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
# The type of runner that the job will run on
strategy:
matrix:
os: [ubuntu-latest] # [ubuntu-latest, macos-latest] #TODO: Fix #505
os: [ubuntu-20.04] # [ubuntu-latest, macos-latest] #TODO: Fix #505
fail-fast: false
runs-on: ${{ matrix.os }}

Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/test_and_validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
# The type of runner that the job will run on
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
os: [ubuntu-20.04, macos-latest]
fail-fast: false
runs-on: ${{ matrix.os }}

Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
# The type of runner that the job will run on
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
os: [ubuntu-20.04, macos-latest]
fail-fast: false
runs-on: ${{ matrix.os }}

Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
# The type of runner that the job will run on
strategy:
matrix:
os: [ubuntu-latest]
os: [ubuntu-20.04]
fail-fast: false
runs-on: ${{ matrix.os }}

Expand Down Expand Up @@ -116,7 +116,7 @@ jobs:
# The type of runner that the job will run on
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
os: [ubuntu-20.04, macos-latest]
fail-fast: false
runs-on: ${{ matrix.os }}

Expand Down Expand Up @@ -151,7 +151,7 @@ jobs:
# The type of runner that the job will run on
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
os: [ubuntu-20.04, macos-latest]
fail-fast: false
runs-on: ${{ matrix.os }}

Expand Down Expand Up @@ -184,7 +184,7 @@ jobs:
# The type of runner that the job will run on
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
os: [ubuntu-20.04, macos-latest]
fail-fast: false
runs-on: ${{ matrix.os }}

Expand Down Expand Up @@ -217,7 +217,7 @@ jobs:
# The type of runner that the job will run on
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
os: [ubuntu-20.04, macos-latest]
fail-fast: false
runs-on: ${{ matrix.os }}

Expand Down Expand Up @@ -252,7 +252,7 @@ jobs:
# The type of runner that the job will run on
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
os: [ubuntu-20.04, macos-latest]
fail-fast: false
runs-on: ${{ matrix.os }}

Expand Down
2 changes: 1 addition & 1 deletion include/NGenConfig.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ namespace exec_info

void runtime_summary(std::ostream& stream) noexcept;
void runtime_usage(const std::string& cmd, std::ostream& stream) noexcept;
};
}

} // namespace ngen

Expand Down
4 changes: 2 additions & 2 deletions include/realizations/catchment/Formulation_Constructors.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace realization {
return [](std::string id, std::shared_ptr<data_access::GenericDataProvider> forcing_provider, utils::StreamHandler output_stream) -> std::shared_ptr<Catchment_Formulation>{
return std::make_shared<T>(id, forcing_provider, output_stream);
};
};
}

static std::map<std::string, constructor> formulations = {
{"bmi_c++", create_formulation_constructor<Bmi_Cpp_Formulation>()},
Expand Down Expand Up @@ -83,7 +83,7 @@ namespace realization {
"\", provider: \"" + forcing_config.provider + "\"");
}
return formulation_constructor(identifier, fp, output_stream);
};
}

static std::string get_formulation_key(const boost::property_tree::ptree &tree) {
/*for (auto &node : tree) {
Expand Down
2 changes: 1 addition & 1 deletion include/realizations/config/config.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,6 @@ namespace realization{
};


};//end namespace config
}//end namespace config
}//end namespace realization
#endif //NGEN_REALIZATION_CONFIG_H
2 changes: 1 addition & 1 deletion include/realizations/config/forcing.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,6 @@ namespace realization{
};


};//end namespace config
}//end namespace config
}//end namespace realization
#endif //NGEN_REALIZATION_CONFIG_FORCING_H
2 changes: 1 addition & 1 deletion include/realizations/config/formulation.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,6 @@ namespace realization{
}
};

};//end namespace config
}//end namespace config
}//end namespace realization
#endif //NGEN_REALIZATION_CONFIG_FORMULATION_H
2 changes: 1 addition & 1 deletion include/realizations/config/routing.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ namespace realization{
}
};

};//end namespace config
}//end namespace config
}//end namespace realization
#endif //NGEN_REALIZATION_CONFIG_ROUTING_H
2 changes: 1 addition & 1 deletion include/realizations/config/time.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,6 @@ namespace realization{
);
}
};
};//end namespace config
}//end namespace config
}//end namespace realization
#endif //NGEN_REALIZATION_CONFIG_TIME_H
2 changes: 1 addition & 1 deletion src/geojson/FeatureCollection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Feature FeatureCollection::remove_feature_by_id(std::string ID) {

int FeatureCollection::get_size() {
return features.size();
};
}

bool FeatureCollection::is_empty() {
return features.size() == 0;
Expand Down
10 changes: 5 additions & 5 deletions src/geojson/JSONProperty.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ long JSONProperty::as_natural_number() const {
// Throw an exception since this can't be considered a natural number
std::string message = key + " is a " + get_propertytype_name(get_type()) + " and cannot be converted into a natural number.";
throw std::runtime_error(message);
};
}

/**
* Get the type of the property (Natural, Real, String, etc)
Expand All @@ -27,7 +27,7 @@ long JSONProperty::as_natural_number() const {
*/
PropertyType JSONProperty::get_type() const {
return type;
};
}


double JSONProperty::as_real_number() const {
Expand All @@ -40,7 +40,7 @@ double JSONProperty::as_real_number() const {

std::string message = key + " is a " + get_propertytype_name(get_type()) + " and cannot be converted into a real number.";
throw std::runtime_error(message);
};
}

bool JSONProperty::as_boolean() const {
if (type == PropertyType::Boolean) {
Expand All @@ -49,7 +49,7 @@ bool JSONProperty::as_boolean() const {

std::string message = key + " is a " + get_propertytype_name(get_type()) + " and cannot be converted into a boolean.";
throw std::runtime_error(message);
};
}

std::vector<JSONProperty> JSONProperty::as_list() const {
std::vector<JSONProperty> copy;
Expand Down Expand Up @@ -131,7 +131,7 @@ std::string JSONProperty::as_string() const {

std::string message = key + " is a " + get_propertytype_name(get_type()) + " and cannot be converted into a string.";
throw std::runtime_error(message);
};
}

JSONProperty JSONProperty::at(std::string key) const {
if (type == PropertyType::Object) {
Expand Down
4 changes: 2 additions & 2 deletions src/geopackage/ngen_sqlite.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ sqlite_error::sqlite_error(const std::string& origin_func, int code, const std::
origin_func + " returned code " + std::to_string(code)
+ " (msg: " + sqlite3_errstr(code) + ")"
+ (extra.empty() ? "" : " " + extra)
){};
){}

const auto sqlite_not_started_error = sqlite_error{
"sqlite iteration is has not started, get() is not callable "
Expand All @@ -41,7 +41,7 @@ database::iterator::iterator(stmt_t&& stmt)
}

restart();
};
}

auto database::iterator::ptr_() const noexcept -> sqlite3_stmt*
{
Expand Down
2 changes: 1 addition & 1 deletion src/routing/Routing_Py_Adapter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Routing_Py_Adapter::Routing_Py_Adapter(std::string t_route_config_file_with_path
void Routing_Py_Adapter::route(int number_of_timesteps, int delta_time,
const std::vector<double> &flow_vector){
throw "Routing_Py_Adapter::route overload with flow_vector unimplemented.";
};
}

void Routing_Py_Adapter::route(int number_of_timesteps, int delta_time)
{
Expand Down
Loading