Skip to content

Release 3.25.06 #224

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.

Sign up for GitHub

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

Merged
albertmena merged 10 commits into from
Jun 26, 2025
Merged

Release 3.25.06 #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5c3a24f
Merge pull request #217 from I2PC/release-3.24.12
albertmena Dec 17, 2024
dd32219
Merge pull request #219 from I2PC/master
albertmena Jan 9, 2025
14e0d8d
Working
Jan 16, 2025
83a0d6e
Merge pull request #220 from I2PC/fi_olz_fix_md_split
albertmena Jan 20, 2025
8d45fa8
Update CMakeLists.txt
albertmena Jan 29, 2025
b9c1941
Merge pull request #221 from I2PC/agm_revertingLibstd
oierlauzi Jan 30, 2025
4c6fd6f
Fix CI badge
martin-s-a Feb 17, 2025
cd98116
Merge pull request #222 from I2PC/ms_ci_badge
albertmena Feb 17, 2025
a95fd34
Add dynamically updated major version tag
martin-s-a Mar 12, 2025
3dba33d
Merge pull request #223 from I2PC/ms_dynamic_tag
albertmena Mar 24, 2025
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
9 changes: 9 additions & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 0 additions & 12 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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) <<<**
Expand Down
5 changes: 4 additions & 1 deletion core/metadata_vec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,7 +820,10 @@ void MetaDataVec::split(size_t parts, std::vector<MetaDataVec> &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);
Expand Down