diff --git a/.github/workflows/citation.yml b/.github/workflows/citation.yml index 9de637fed4..db667992c9 100644 --- a/.github/workflows/citation.yml +++ b/.github/workflows/citation.yml @@ -24,7 +24,7 @@ jobs: uses: dieghernan/cff-validator@main # Upload artifact in case of failure - name: Update artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 if: failure() with: name: citation-cff-errors diff --git a/.github/workflows/gnss-sdr_archs.yml b/.github/workflows/gnss-sdr_archs.yml index 6ba71fb648..ca95951878 100644 --- a/.github/workflows/gnss-sdr_archs.yml +++ b/.github/workflows/gnss-sdr_archs.yml @@ -41,7 +41,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: uraimo/run-on-arch-action@v2.6.0 + - uses: uraimo/run-on-arch-action@v2.7.1 name: Test in non-x86 container continue-on-error: ${{ contains(fromJson('["ppc64le", "s390x"]'), matrix.arch) }} id: test diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 183a871efb..eeecbaf389 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -54,8 +54,7 @@ jobs: rm /usr/local/bin/python3.1* || true export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install ninja hdf5 automake armadillo lapack libmatio \ - gflags glog gnuradio log4cpp openssl pugixml protobuf - pip3 install mako + gflags glog gnuradio log4cpp openssl pugixml protobuf python-mako - name: configure run: cd build && cmake -GNinja .. - name: build @@ -83,8 +82,7 @@ jobs: rm /usr/local/bin/python3.1* || true export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install ninja pkg-config hdf5 automake armadillo lapack libmatio \ - gflags glog gnuradio log4cpp openssl pugixml protobuf - pip3 install mako + gflags glog gnuradio log4cpp openssl pugixml protobuf python-mako - name: configure run: cd build && cmake -GXcode .. - name: build @@ -131,8 +129,7 @@ jobs: rm /usr/local/bin/python3.1* || true export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install llvm pkg-config hdf5 armadillo lapack gflags glog gnuradio libmatio \ - log4cpp openssl pugixml protobuf - pip3 install mako + log4cpp openssl pugixml protobuf python-mako ln -s $(brew --prefix llvm)/bin/clang-tidy /usr/local/bin ln -s $(brew --prefix llvm)/bin/clang-apply-replacements /usr/local/bin ln -s $(brew --prefix llvm)/bin/run-clang-tidy /usr/local/bin diff --git a/.github/workflows/volk_gnsssdr_archs.yml b/.github/workflows/volk_gnsssdr_archs.yml index 0e34896476..6f4e314543 100644 --- a/.github/workflows/volk_gnsssdr_archs.yml +++ b/.github/workflows/volk_gnsssdr_archs.yml @@ -45,7 +45,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: uraimo/run-on-arch-action@v2.6.0 + - uses: uraimo/run-on-arch-action@v2.7.1 name: Build in non-x86 container # continue-on-error: ${{ contains(fromJson('["ppc64le", "s390x"]'), matrix.arch) }} id: build diff --git a/CMakeLists.txt b/CMakeLists.txt index 8257ffdc3e..99e567462f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -142,7 +142,7 @@ option(ENABLE_ORC "Use (if available) the Optimized Inner Loop Runtime Compiler ################################################################################ # GNSS-SDR version information ################################################################################ -set(THIS_IS_A_RELEASE ON) # only related to version name, no further implications. +set(THIS_IS_A_RELEASE OFF) # only related to version name, no further implications. if(NOT ${THIS_IS_A_RELEASE}) find_package(Git) set_package_properties(Git PROPERTIES diff --git a/cmake/Modules/FindGLOG.cmake b/cmake/Modules/FindGLOG.cmake index e483dfbe9e..eb0f9d7006 100644 --- a/cmake/Modules/FindGLOG.cmake +++ b/cmake/Modules/FindGLOG.cmake @@ -71,6 +71,7 @@ macro(_FIND_GLOG_LIBRARIES _var) /usr/lib/x86_64-linux-gnux32 /usr/lib/alpha-linux-gnu /usr/lib/riscv64-linux-gnu + /usr/lib/loongarch64-linux-gnu /usr/local/lib /usr/local/lib64 /opt/local/lib @@ -178,3 +179,8 @@ if(GLOG_FOUND AND NOT TARGET Glog::glog) INTERFACE_LINK_LIBRARIES "${GLOG_LIBRARIES}" ) endif() + +# Fix for glog 0.7.0 +if(EXISTS ${GLOG_INCLUDE_DIRS}/export.h) + set_target_properties(Glog::glog PROPERTIES INTERFACE_COMPILE_DEFINITIONS "GLOG_USE_GLOG_EXPORT") +endif() diff --git a/src/algorithms/signal_source/libs/fpga_buffer_monitor.cc b/src/algorithms/signal_source/libs/fpga_buffer_monitor.cc index 136409f126..4495794417 100644 --- a/src/algorithms/signal_source/libs/fpga_buffer_monitor.cc +++ b/src/algorithms/signal_source/libs/fpga_buffer_monitor.cc @@ -31,6 +31,7 @@ #include // for string, ofstream #include // for cout #include // for mmap +#include // for close #include // for move diff --git a/src/algorithms/signal_source/libs/fpga_dynamic_bit_selection.cc b/src/algorithms/signal_source/libs/fpga_dynamic_bit_selection.cc index 933d8b77f6..8cec947efb 100644 --- a/src/algorithms/signal_source/libs/fpga_dynamic_bit_selection.cc +++ b/src/algorithms/signal_source/libs/fpga_dynamic_bit_selection.cc @@ -25,6 +25,7 @@ #include // for open, O_RDWR, O_SYNC #include // for cout #include // for mmap +#include // for close Fpga_dynamic_bit_selection::Fpga_dynamic_bit_selection(bool enable_rx1_band, bool enable_rx2_band) : d_map_base_freq_band_1(nullptr), diff --git a/src/algorithms/signal_source/libs/fpga_switch.cc b/src/algorithms/signal_source/libs/fpga_switch.cc index 4bcbe4dc92..b56f63bf5c 100644 --- a/src/algorithms/signal_source/libs/fpga_switch.cc +++ b/src/algorithms/signal_source/libs/fpga_switch.cc @@ -25,6 +25,7 @@ #include // for open, O_RDWR, O_SYNC #include // for cout #include // for mmap +#include // for close Fpga_Switch::Fpga_Switch(const std::string &device_name) { diff --git a/src/tests/system-tests/position_test.cc b/src/tests/system-tests/position_test.cc index ecf90f3654..5802aa9caa 100644 --- a/src/tests/system-tests/position_test.cc +++ b/src/tests/system-tests/position_test.cc @@ -312,7 +312,7 @@ int PositionSystemTest::configure_receiver() // Set PVT config->set_property("PVT.implementation", "RTKLIB_PVT"); - config->set_property("PVT.enable_pvt_kf", "true"), + config->set_property("PVT.enable_pvt_kf", "true"); config->set_property("PVT.positioning_mode", "PPP_Static"); config->set_property("PVT.output_rate_ms", std::to_string(output_rate_ms)); config->set_property("PVT.display_rate_ms", std::to_string(display_rate_ms));