Skip to content
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
2 changes: 1 addition & 1 deletion .github/workflows/dnmtools_release_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
cd /workspace && \
autoreconf -i && \
mkdir build && cd build && \
../configure --with-libdeflate && \
../configure --with-libdeflate --with-htsmods && \
../data/make_full_license_info_header.sh ../data/LICENSE > license.h && \
echo "#define INCLUDE_FULL_LICENSE_INFO 1" >> config.h && \
make -j4 LDFLAGS="-static-libgcc -static-libstdc++ -s" && \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dnmtools_release_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
run: |
./autogen.sh
mkdir build && cd build
../configure --with-libdeflate \
../configure --with-libdeflate --with-htsmods \
CXX=g++-14 \
LDFLAGS="-L/opt/dnmtools/lib -static-libgcc -static-libstdc++ -Wl,-dead_strip" \
CPPFLAGS="-I/opt/dnmtools/include"
Expand Down
10 changes: 6 additions & 4 deletions src/analysis/nanopore.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -942,14 +942,16 @@ valid_modification_types(const std::string &infile,
// ADS: or bam_parse_basemod2(aln.b, m, HTS_MOD_REPORT_UNCHECKED)
int n_types{};
const auto types = bam_mods_recorded(m.get(), &n_types);
valid_types = (n_types == 1 && types[0] == 'C') ||
(n_types >= 2 && types[0] == 'h' && types[1] == 'm');
// clang-format off
valid_types = ((n_types == 0) ||
(n_types == 1 && types[0] == 'C') ||
(n_types >= 2 && types[0] == 'h' && types[1] == 'm'));
// clang-format on
if (!valid_types) {
message = "n_types: " + std::to_string(n_types) + "\n";
for (auto i = 0; i < n_types; ++i) {
for (auto i = 0; i < n_types; ++i)
message += "type[" + std::to_string(i) +
"]=" + std::to_string(static_cast<char>(types[i])) + "\n";
}
}
}
return std::make_pair(valid_types, message);
Expand Down