Merge pull request #132 from ismrmrd/update_for_ismrmrd_1p14p1

update for ismrmrd 1p14p1
ismrmrd · Aug 6, 2024 · cda30e2 · cda30e2
2 parents 545ee4d + 5c52ee2
commit cda30e2
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/siemens_to_ismrmrd_conda.yml b/.github/workflows/siemens_to_ismrmrd_conda.yml
@@ -5,16 +5,17 @@ on:
   release:
     types:
       - created
+  workflow_dispatch:
 
 jobs:
   build-conda-packages:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest, macos-13]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
-      - uses: conda-incubator/setup-miniconda@e81abac10ce2c37423b54eae5af93aa3b4d3475c
+      - uses: actions/checkout@v4
+      - uses: conda-incubator/setup-miniconda@v3
         with:
           activate-environment: siemens-to-ismrmrd-build
           environment-file: conda/environment.yml

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,7 +18,7 @@ message(STATUS "Looking for packages in : ${CMAKE_PREFIX_PATH}")
 #VERSIONING
 set(SIEMENS_TO_ISMRMRD_VERSION_MAJOR 1)
 set(SIEMENS_TO_ISMRMRD_VERSION_MINOR 2)
-set(SIEMENS_TO_ISMRMRD_VERSION_PATCH 11)
+set(SIEMENS_TO_ISMRMRD_VERSION_PATCH 12)
 set(SIEMENS_TO_ISMRMRD_VERSION_STRING ${SIEMENS_TO_ISMRMRD_VERSION_MAJOR}.${SIEMENS_TO_ISMRMRD_VERSION_MINOR}.${SIEMENS_TO_ISMRMRD_VERSION_PATCH})
 
 # Generate the converter_version.h header file
@@ -67,7 +67,7 @@ set(Boost_USE_STATIC_RUNTIME OFF)
 
 
 find_package(Boost COMPONENTS system thread program_options filesystem timer REQUIRED)
-find_package(ISMRMRD 1.8.0 REQUIRED)
+find_package(ISMRMRD 1.14.1 REQUIRED)
 find_package(HDF5  REQUIRED COMPONENTS C)
 
 include_directories( ${ISMRMRD_INCLUDE_DIR} ${HDF5_C_INCLUDE_DIR} )

diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@ FROM ubuntu:latest as ismrmrd_base
 ARG DEBIAN_FRONTEND=noninteractive
 ENV TZ=America/Chicago
 
-RUN apt-get update && apt-get install -y git cmake g++ libhdf5-dev libxml2-dev libxslt1-dev libboost-dev libboost-program-options-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-timer-dev libboost-program-options-dev
+RUN apt-get update && apt-get install -y git cmake g++ libhdf5-dev libxml2-dev libxslt1-dev libboost-dev libboost-program-options-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-timer-dev libboost-program-options-dev libpugixml-dev
 
 RUN  mkdir -p /opt/code
 
@@ -35,7 +35,7 @@ RUN cd /usr/local/lib && tar -czvf libismrmrd.tar.gz libismrmrd*
 # ----- Start another clean build without all of the build dependencies of siemens_to_ismrmrd -----
 FROM ubuntu:latest
 
-RUN apt-get update && apt-get install -y --no-install-recommends libxslt1.1 libhdf5-103 && apt-get clean && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y --no-install-recommends libxslt1.1 libhdf5-dev && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Copy siemens_to_ismrmrd from last stage and re-add necessary dependencies
 COPY --from=ismrmrd_base /usr/local/bin/siemens_to_ismrmrd  /usr/local/bin/siemens_to_ismrmrd

diff --git a/conda/meta.yaml b/conda/meta.yaml
@@ -17,15 +17,15 @@ requirements:
     - cmake>=3.20.0
     - gcc_linux-64>=9.0.0  # [linux64] 
     - gxx_linux-64>=9.0.0  # [linux64]
-    - ismrmrd=1.13.7
-    - libxml2=2.9
+    - ismrmrd=1.14.1
+    - libxml2>=2.9
     - libxslt=1.1 
-    - ninja=1.10.*
+    - ninja=1.12.*
 
   run:
-    - ismrmrd=1.13.7
+    - ismrmrd=1.14.1
     - boost {{ boost }}
-    - libxml2=2.9
+    - libxml2>=2.9
     - libxslt=1.1 
 
 about:

diff --git a/dependencies/ismrmrd b/dependencies/ismrmrd
@@ -1 +1 @@
-f9e38ed8cda6428839005c060579d3dfdb043515
+4037c41fcdcb8870234baaeb46ce4848aac1579a
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		f9e38ed8cda6428839005c060579d3dfdb043515
		4037c41fcdcb8870234baaeb46ce4848aac1579a