From 14e0d8d6dc2e8a3fc7d700dafb49485b41fa935d Mon Sep 17 00:00:00 2001 From: Oier Lauzirika Zarrabeitia Date: Thu, 16 Jan 2025 13:39:54 +0000 Subject: [PATCH 1/4] Working --- core/metadata_vec.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/core/metadata_vec.cpp b/core/metadata_vec.cpp index 111d310c..86338b76 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); From 8d45fa8d3503c51ec6cff497a36f46bd6d164144 Mon Sep 17 00:00:00 2001 From: alberto Date: Wed, 29 Jan 2025 12:48:06 +0100 Subject: [PATCH 2/4] Update CMakeLists.txt --- CMakeLists.txt | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3817e0d2..1b0b7667 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} From 4c6fd6f2e719c66a057215dc32b63bddfcd0fccb Mon Sep 17 00:00:00 2001 From: Martin Salinas Date: Mon, 17 Feb 2025 10:04:48 +0100 Subject: [PATCH 3/4] Fix CI badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7b470c24..37971564 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) <<<** From a95fd3406e92840f1e19191e686267416126fa38 Mon Sep 17 00:00:00 2001 From: Martin Salinas Date: Wed, 12 Mar 2025 16:40:55 +0100 Subject: [PATCH 4/4] Add dynamically updated major version tag --- .github/workflows/release.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 93ed0223..3d913143 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