diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 93ed022..3d91314 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,6 +24,15 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} custom_tag: ${{ steps.variables.outputs.TAG_NAME }} + + - name: Update major version tag + run: | + VERSION=${{ steps.variables.outputs.TAG_NAME }} + MAJOR=${VERSION%%.*} + git config --global user.name 'GitHub Actions' + git config --global user.email 'action@github.com' + git tag -fa "${MAJOR}" -m 'Update major version tag with $VERSION' + git push origin "${MAJOR}" --force - name: Create a GitHub release uses: ncipollo/release-action@main diff --git a/CMakeLists.txt b/CMakeLists.txt index 3817e0d..1b0b766 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,8 +55,6 @@ find_package(Threads REQUIRED) find_package(FFTW REQUIRED) -find_library(LIBSTDCXX_LIBRARY stdc++) - # Register all source and header files file(GLOB_RECURSE SOURCES @@ -100,16 +98,6 @@ target_link_libraries( ${HDF5_LIBRARIES} ) -if(LIBSTDCXX_LIBRARY) - message("Linking to libstdc++ at ${LIBSTDCXX_LIBRARY}") - target_link_libraries( - ${PROJECT_NAME} - PUBLIC - ${LIBSTDCXX_LIBRARY} - ) - -endif() - # Install library's binary files and headers install( TARGETS ${PROJECT_NAME} diff --git a/README.md b/README.md index 7b470c2..3797156 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # xmippCore -[![CI](https://github.com/I2PC/xmippCore/actions/workflows/main.yml/badge.svg)](https://github.com/I2PC/xmippCore/actions/workflows/main.yml) +[![CI](https://github.com/I2PC/xmippCore/actions/workflows/build.yml/badge.svg)](https://github.com/I2PC/xmippCore/actions/workflows/build.yml) **>>> To install Xmipp, please visit [this](https://github.com/I2PC/xmipp#xmipp) <<<** diff --git a/core/metadata_vec.cpp b/core/metadata_vec.cpp index 111d310..86338b7 100644 --- a/core/metadata_vec.cpp +++ b/core/metadata_vec.cpp @@ -820,7 +820,10 @@ void MetaDataVec::split(size_t parts, std::vector &results, const M REPORT_ERROR(ERR_MD, "MetaDataDb::split: Couldn't split a metadata in more parts than its size"); MetaDataVec sorted; - sorted.sort(*this, sortLabel); + if (sortLabel == MDL_UNDEFINED) + sorted = *this; + else + sorted.sort(*this, sortLabel); results.clear(); results.resize(parts);