From b5ddbb4e2671614faa478904dceb51bfab640b00 Mon Sep 17 00:00:00 2001 From: "jacques.morice" Date: Thu, 25 Jun 2026 15:04:46 +0200 Subject: [PATCH 01/12] debuntu with catalyst --- .github/workflows/debuntu_docker_images.yml | 2 +- debuntu/all/Dockerfile | 45 ++++++++++++++++++-- debuntu/all/build_catalyst.sh | 27 ++++++++++++ debuntu/all/cmake_catalyst.sh | 21 ++++++++++ debuntu/all/install_catalyst.sh | 12 ++++++ debuntu/mini/Dockerfile | 46 +++++++++++++++++++-- debuntu/mini/build_catalyst.sh | 27 ++++++++++++ debuntu/mini/cmake_catalyst.sh | 21 ++++++++++ debuntu/mini/install_catalyst.sh | 12 ++++++ spack/3-baselibs/deps.sh | 2 +- 10 files changed, 206 insertions(+), 9 deletions(-) create mode 100644 debuntu/all/build_catalyst.sh create mode 100644 debuntu/all/cmake_catalyst.sh create mode 100644 debuntu/all/install_catalyst.sh create mode 100644 debuntu/mini/build_catalyst.sh create mode 100644 debuntu/mini/cmake_catalyst.sh create mode 100644 debuntu/mini/install_catalyst.sh diff --git a/.github/workflows/debuntu_docker_images.yml b/.github/workflows/debuntu_docker_images.yml index 1725881..a358735 100644 --- a/.github/workflows/debuntu_docker_images.yml +++ b/.github/workflows/debuntu_docker_images.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/checkout@v6 with: { submodules: 'recursive' } - name: "Build and push" - uses: pdidev/test_env/.github/actions/build@v4 + uses: jmorice91/test_env/.github/actions/build@adding_catalyst with: GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" context: "./" diff --git a/debuntu/all/Dockerfile b/debuntu/all/Dockerfile index 9590a33..70bdb11 100644 --- a/debuntu/all/Dockerfile +++ b/debuntu/all/Dockerfile @@ -36,7 +36,7 @@ RUN set -ex \ && echo "deb [ arch=amd64 ] https://repo.pdi.dev/pdi-main.${DISTRO} ${VERSION_CODENAME} main" > /etc/apt/sources.list.d/pdi.list \ && curl --output /etc/apt/trusted.gpg.d/pdidev-archive-keyring.gpg https://repo.pdi.dev/pdi-main.${DISTRO}/pdidev-archive-keyring.gpg \ && apt-get update -y \ - && if [[ "${MPI}" = openmpi ]]; then MPI4PY=python3-mpi4py; FLOWVR=flowvr; fi\ + && if [[ "${MPI}" = openmpi ]]; then MPI4PY=python3-mpi4py; FLOWVR=flowvr; fi \ && apt-get install -y --no-install-recommends \ build-essential \ cmake \ @@ -82,17 +82,56 @@ ENV HOME=/home/ci USER ci:ci WORKDIR ${HOME} +FROM main AS builder_catalyst +USER root +RUN set -ex \ +&& export DEBIAN_FRONTEND=noninteractive \ +&& apt-get update -y \ +&& apt-get upgrade -y \ +&& apt-get install -y --no-install-recommends \ + apt-transport-https \ + ca-certificates \ + git \ + ninja-build \ +&& rm -rf /var/lib/apt/lists/* +# copy file for building and installing catalyst +COPY cmake_catalyst.sh ${HOME} +COPY build_catalyst.sh ${HOME} +COPY install_catalyst.sh ${HOME} -FROM alpine/git AS pdidl +RUN chmod +x /home/ci/cmake_catalyst.sh +RUN chmod +x /home/ci/build_catalyst.sh +RUN chmod +x /home/ci/install_catalyst.sh + +RUN chown ci /home/ci/cmake_catalyst.sh +RUN chown ci /home/ci/build_catalyst.sh + +RUN set -ex && bash /home/ci/cmake_catalyst.sh -RUN git -C /root clone --recurse-submodules https://github.com/pdidev/pdi.git /root/pdi +USER ci +RUN set -ex && bash /home/ci/build_catalyst.sh +USER root +RUN set -ex && bash /home/ci/install_catalyst.sh +USER ci + +FROM alpine/git AS pdidl + +#RUN git -C /root clone --recurse-submodules https://github.com/pdidev/pdi.git /root/pdi +RUN git -C /root clone -b catalyst-plugin --recurse-submodules https://github.com/francois-kitware/pdi /root/pdi FROM main AS test COPY --from=pdidl --chown=ci:ci /root/pdi /home/ci/pdi +COPY --from=builder_catalyst --chown=ci:ci /opt/catalyst /opt/catalyst + +WORKDIR ${HOME} +## Add env varible for catalyst lib +ENV LD_LIBRARY_PATH="/opt/catalyst/lib" +ENV catalyst_dir="/opt/catalyst/lib/cmake/catalyst-2.0" +## add to check if catalyst_dir is needed RUN export VERBOSE=1 \ && bash pdi/bin/build_and_run_all_tests diff --git a/debuntu/all/build_catalyst.sh b/debuntu/all/build_catalyst.sh new file mode 100644 index 0000000..22aa79f --- /dev/null +++ b/debuntu/all/build_catalyst.sh @@ -0,0 +1,27 @@ +#!/bin/bash +set -x +cmake_catalyst_required=3.26.0 +cmake_installed=$(cmake --version | head -1 | cut -f3 -d" ") + +mapfile -t sorted < <(printf "%s\n" "$cmake_installed" "$cmake_catalyst_required" | sort -V) + +cmake_executable=cmake +if [[ ${sorted[0]} == "$cmake_catalyst_required" ]]; then + cmake_executable=cmake +else + cmake_executable=/home/ci/local-cmake/install/bin/cmake +fi +git clone --branch v2.0.0 \ + --single-branch \ + https://gitlab.kitware.com/paraview/catalyst.git \ + ${HOME}/catalyst_clone/ +mkdir ${HOME}/catalyst_clone/ +mkdir build +git submodule update --depth=1 --init --recursive +${cmake_executable} -GNinja -DCATALYST_BUILD_TESTING:BOOL=OFF \ + -DCATALYST_USE_MPI:BOOL=ON \ + -DCATALYST_WRAP_FORTRAN:BOOL=OFF \ + -DCATALYST_WRAP_PYTHON:BOOL=ON \ + -DCMAKE_INSTALL_PREFIX:PATH=/opt/catalyst/ \ + -S ${HOME}/catalyst_clone/ -B ${HOME}/catalyst_clone/build +${cmake_executable} --build ${HOME}/catalyst_clone/build \ No newline at end of file diff --git a/debuntu/all/cmake_catalyst.sh b/debuntu/all/cmake_catalyst.sh new file mode 100644 index 0000000..1e84c25 --- /dev/null +++ b/debuntu/all/cmake_catalyst.sh @@ -0,0 +1,21 @@ +#!/bin/bash +set -x +cmake_catalyst_required=3.26.0 +cmake_installed=$(cmake --version | head -1 | cut -f3 -d" ") + +mapfile -t sorted < <(printf "%s\n" "$cmake_installed" "$cmake_catalyst_required" | sort -V) + +if [[ ${sorted[0]} == "$cmake_catalyst_required" ]]; then + echo "cmake version $cmake_installed >= $cmake_catalyst_required" +else + echo "compile cmake" + git clone https://gitlab.kitware.com/cmake/cmake.git local-cmake + cd local-cmake && git checkout v3.30.0 + echo "mkdir install" + mkdir install + echo "mkdir build" + mkdir build && cd build + set -x && ../bootstrap --prefix=../install -- -DCMAKE_USE_OPENSSL=OFF + make -j 8 + make install +fi diff --git a/debuntu/all/install_catalyst.sh b/debuntu/all/install_catalyst.sh new file mode 100644 index 0000000..0c6788a --- /dev/null +++ b/debuntu/all/install_catalyst.sh @@ -0,0 +1,12 @@ +#!/bin/bash +set -x +cmake_catalyst_required=3.26.0 +cmake_installed=$(cmake --version | head -1 | cut -f3 -d" ") + +mapfile -t sorted < <(printf "%s\n" "$cmake_installed" "$cmake_catalyst_required" | sort -V) + +if [[ ${sorted[0]} == "$cmake_catalyst_required" ]]; then + cmake --install ${HOME}/catalyst_clone/build +else + /home/ci/local-cmake/install/bin/cmake --install ${HOME}/catalyst_clone/build +fi diff --git a/debuntu/mini/Dockerfile b/debuntu/mini/Dockerfile index 46f53af..c00608e 100644 --- a/debuntu/mini/Dockerfile +++ b/debuntu/mini/Dockerfile @@ -72,21 +72,59 @@ ENV HOME=/home/ci USER ci:ci WORKDIR ${HOME} +## chmod -R o+rX . +FROM main AS builder_catalyst +USER root +RUN set -ex \ +&& export DEBIAN_FRONTEND=noninteractive \ +&& apt-get update -y \ +&& apt-get upgrade -y \ +&& apt-get install -y --no-install-recommends \ + apt-transport-https \ + ca-certificates \ + git \ + ninja-build \ +&& rm -rf /var/lib/apt/lists/* +# copy file for building and installing catalyst +COPY cmake_catalyst.sh ${HOME} +COPY build_catalyst.sh ${HOME} +COPY install_catalyst.sh ${HOME} -FROM alpine/git AS pdidl +RUN chmod +x /home/ci/cmake_catalyst.sh +RUN chmod +x /home/ci/build_catalyst.sh +RUN chmod +x /home/ci/install_catalyst.sh + +RUN chown ci /home/ci/cmake_catalyst.sh +RUN chown ci /home/ci/build_catalyst.sh -RUN git -C /root clone --recurse-submodules https://github.com/pdidev/pdi.git /root/pdi +RUN set -ex && bash /home/ci/cmake_catalyst.sh +USER ci +RUN set -ex && bash /home/ci/build_catalyst.sh +USER root +RUN set -ex && bash /home/ci/install_catalyst.sh + +USER ci + +FROM alpine/git AS pdidl + +#RUN git -C /root clone --recurse-submodules https://github.com/pdidev/pdi.git /root/pdi +RUN git -C /root clone -b catalyst-plugin --recurse-submodules https://github.com/francois-kitware/pdi /root/pdi FROM main AS test COPY --from=pdidl --chown=ci:ci /root/pdi /home/ci/pdi +COPY --from=builder_catalyst --chown=ci:ci /opt/catalyst /opt/catalyst + +WORKDIR ${HOME} +## Add env varible for catalyst lib +ENV LD_LIBRARY_PATH="/opt/catalyst/lib" +ENV catalyst_dir="/opt/catalyst/lib/cmake/catalyst-2.0" +## add to check if catalyst_dir is needed RUN export VERBOSE=1 \ && bash pdi/bin/build_and_run_all_tests - - FROM main diff --git a/debuntu/mini/build_catalyst.sh b/debuntu/mini/build_catalyst.sh new file mode 100644 index 0000000..22aa79f --- /dev/null +++ b/debuntu/mini/build_catalyst.sh @@ -0,0 +1,27 @@ +#!/bin/bash +set -x +cmake_catalyst_required=3.26.0 +cmake_installed=$(cmake --version | head -1 | cut -f3 -d" ") + +mapfile -t sorted < <(printf "%s\n" "$cmake_installed" "$cmake_catalyst_required" | sort -V) + +cmake_executable=cmake +if [[ ${sorted[0]} == "$cmake_catalyst_required" ]]; then + cmake_executable=cmake +else + cmake_executable=/home/ci/local-cmake/install/bin/cmake +fi +git clone --branch v2.0.0 \ + --single-branch \ + https://gitlab.kitware.com/paraview/catalyst.git \ + ${HOME}/catalyst_clone/ +mkdir ${HOME}/catalyst_clone/ +mkdir build +git submodule update --depth=1 --init --recursive +${cmake_executable} -GNinja -DCATALYST_BUILD_TESTING:BOOL=OFF \ + -DCATALYST_USE_MPI:BOOL=ON \ + -DCATALYST_WRAP_FORTRAN:BOOL=OFF \ + -DCATALYST_WRAP_PYTHON:BOOL=ON \ + -DCMAKE_INSTALL_PREFIX:PATH=/opt/catalyst/ \ + -S ${HOME}/catalyst_clone/ -B ${HOME}/catalyst_clone/build +${cmake_executable} --build ${HOME}/catalyst_clone/build \ No newline at end of file diff --git a/debuntu/mini/cmake_catalyst.sh b/debuntu/mini/cmake_catalyst.sh new file mode 100644 index 0000000..1e84c25 --- /dev/null +++ b/debuntu/mini/cmake_catalyst.sh @@ -0,0 +1,21 @@ +#!/bin/bash +set -x +cmake_catalyst_required=3.26.0 +cmake_installed=$(cmake --version | head -1 | cut -f3 -d" ") + +mapfile -t sorted < <(printf "%s\n" "$cmake_installed" "$cmake_catalyst_required" | sort -V) + +if [[ ${sorted[0]} == "$cmake_catalyst_required" ]]; then + echo "cmake version $cmake_installed >= $cmake_catalyst_required" +else + echo "compile cmake" + git clone https://gitlab.kitware.com/cmake/cmake.git local-cmake + cd local-cmake && git checkout v3.30.0 + echo "mkdir install" + mkdir install + echo "mkdir build" + mkdir build && cd build + set -x && ../bootstrap --prefix=../install -- -DCMAKE_USE_OPENSSL=OFF + make -j 8 + make install +fi diff --git a/debuntu/mini/install_catalyst.sh b/debuntu/mini/install_catalyst.sh new file mode 100644 index 0000000..0c6788a --- /dev/null +++ b/debuntu/mini/install_catalyst.sh @@ -0,0 +1,12 @@ +#!/bin/bash +set -x +cmake_catalyst_required=3.26.0 +cmake_installed=$(cmake --version | head -1 | cut -f3 -d" ") + +mapfile -t sorted < <(printf "%s\n" "$cmake_installed" "$cmake_catalyst_required" | sort -V) + +if [[ ${sorted[0]} == "$cmake_catalyst_required" ]]; then + cmake --install ${HOME}/catalyst_clone/build +else + /home/ci/local-cmake/install/bin/cmake --install ${HOME}/catalyst_clone/build +fi diff --git a/spack/3-baselibs/deps.sh b/spack/3-baselibs/deps.sh index e92ef5d..4e9ec12 100644 --- a/spack/3-baselibs/deps.sh +++ b/spack/3-baselibs/deps.sh @@ -3,7 +3,7 @@ BASE_BUILDDEPS="cmake doxygen pkgconf py-setuptools" # libraries that are required in all cases BASE_LIBS="py-numpy py-pyyaml python" # libraries that depend on MPI & are required in all cases -BASE_MPILIBS="py-mpi4py" +BASE_MPILIBS="py-mpi4py catalyst@2.0.0+mpi+python" # libraries that are optional because embedded in PDI OPT_LIBS="paraconf py-pybind11 spdlog" # libraries that depend on MPI & are optional because embedded in PDI From 3cc22ec81d5f657077767fd64bde5c64639d4629 Mon Sep 17 00:00:00 2001 From: "jacques.morice" Date: Thu, 25 Jun 2026 16:10:43 +0200 Subject: [PATCH 02/12] use action build of v4 --- .github/workflows/debuntu_docker_images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/debuntu_docker_images.yml b/.github/workflows/debuntu_docker_images.yml index a358735..1725881 100644 --- a/.github/workflows/debuntu_docker_images.yml +++ b/.github/workflows/debuntu_docker_images.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/checkout@v6 with: { submodules: 'recursive' } - name: "Build and push" - uses: jmorice91/test_env/.github/actions/build@adding_catalyst + uses: pdidev/test_env/.github/actions/build@v4 with: GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" context: "./" From 7d5f4a3fa9c6e7645bbef78f41109bc2a8bb6b29 Mon Sep 17 00:00:00 2001 From: "jacques.morice" Date: Fri, 26 Jun 2026 14:50:06 +0200 Subject: [PATCH 03/12] add here document --- debuntu/all/Dockerfile | 66 ++++++++++++++++++++++------------------- debuntu/mini/Dockerfile | 61 +++++++++++++++++++++---------------- 2 files changed, 71 insertions(+), 56 deletions(-) diff --git a/debuntu/all/Dockerfile b/debuntu/all/Dockerfile index 70bdb11..4a6c0ec 100644 --- a/debuntu/all/Dockerfile +++ b/debuntu/all/Dockerfile @@ -84,38 +84,45 @@ WORKDIR ${HOME} FROM main AS builder_catalyst USER root -RUN set -ex \ -&& export DEBIAN_FRONTEND=noninteractive \ -&& apt-get update -y \ -&& apt-get upgrade -y \ -&& apt-get install -y --no-install-recommends \ + +RUN < Date: Fri, 26 Jun 2026 15:11:02 +0200 Subject: [PATCH 04/12] try to fix here document --- debuntu/all/Dockerfile | 3 +-- debuntu/mini/Dockerfile | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/debuntu/all/Dockerfile b/debuntu/all/Dockerfile index 4a6c0ec..4e16162 100644 --- a/debuntu/all/Dockerfile +++ b/debuntu/all/Dockerfile @@ -86,14 +86,13 @@ FROM main AS builder_catalyst USER root RUN < Date: Fri, 26 Jun 2026 15:14:05 +0200 Subject: [PATCH 05/12] try to fix here document --- debuntu/all/Dockerfile | 6 +++--- debuntu/mini/Dockerfile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debuntu/all/Dockerfile b/debuntu/all/Dockerfile index 4e16162..759b696 100644 --- a/debuntu/all/Dockerfile +++ b/debuntu/all/Dockerfile @@ -93,9 +93,9 @@ cmake_installed=$(cmake --version | head -1 | cut -f3 -d" ") mapfile -t sorted < <(printf "%s\n" "$cmake_installed" "$cmake_catalyst_required" | sort -V) if [[ ${sorted[0]} == "$cmake_catalyst_required" ]]; then - export DEBIAN_FRONTEND=noninteractive \ - apt-get update -y \ - apt-get upgrade -y \ + export DEBIAN_FRONTEND=noninteractive + apt-get update -y + apt-get upgrade -y apt-get install -y --no-install-recommends \ apt-transport-https \ ca-certificates \ diff --git a/debuntu/mini/Dockerfile b/debuntu/mini/Dockerfile index 17f8dc9..f720919 100644 --- a/debuntu/mini/Dockerfile +++ b/debuntu/mini/Dockerfile @@ -84,9 +84,9 @@ cmake_installed=$(cmake --version | head -1 | cut -f3 -d" ") mapfile -t sorted < <(printf "%s\n" "$cmake_installed" "$cmake_catalyst_required" | sort -V) if [[ ${sorted[0]} == "$cmake_catalyst_required" ]]; then - export DEBIAN_FRONTEND=noninteractive \ - apt-get update -y \ - apt-get upgrade -y \ + export DEBIAN_FRONTEND=noninteractive + apt-get update -y + apt-get upgrade -y apt-get install -y --no-install-recommends \ apt-transport-https \ ca-certificates \ From 3b43b7b1eafc29c1d0c1ae1142e207f93b9b09d6 Mon Sep 17 00:00:00 2001 From: "jacques.morice" Date: Fri, 26 Jun 2026 15:18:10 +0200 Subject: [PATCH 06/12] try to fix here document --- debuntu/all/Dockerfile | 2 +- debuntu/mini/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debuntu/all/Dockerfile b/debuntu/all/Dockerfile index 759b696..1f71002 100644 --- a/debuntu/all/Dockerfile +++ b/debuntu/all/Dockerfile @@ -100,7 +100,7 @@ if [[ ${sorted[0]} == "$cmake_catalyst_required" ]]; then apt-transport-https \ ca-certificates \ git \ - ninja-build \ + ninja-build rm -rf /var/lib/apt/lists/* git clone --branch v2.0.0 \ diff --git a/debuntu/mini/Dockerfile b/debuntu/mini/Dockerfile index f720919..e9c9e8b 100644 --- a/debuntu/mini/Dockerfile +++ b/debuntu/mini/Dockerfile @@ -91,7 +91,7 @@ if [[ ${sorted[0]} == "$cmake_catalyst_required" ]]; then apt-transport-https \ ca-certificates \ git \ - ninja-build \ + ninja-build rm -rf /var/lib/apt/lists/* git clone --branch v2.0.0 \ From 3e27822f4eb6a7a3f6797d4553b0e919cda77b00 Mon Sep 17 00:00:00 2001 From: "jacques.morice" Date: Fri, 26 Jun 2026 15:22:49 +0200 Subject: [PATCH 07/12] try to fix here document --- debuntu/all/Dockerfile | 2 +- debuntu/mini/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debuntu/all/Dockerfile b/debuntu/all/Dockerfile index 1f71002..87a798e 100644 --- a/debuntu/all/Dockerfile +++ b/debuntu/all/Dockerfile @@ -107,7 +107,7 @@ if [[ ${sorted[0]} == "$cmake_catalyst_required" ]]; then --single-branch \ https://gitlab.kitware.com/paraview/catalyst.git \ ${HOME}/catalyst_clone/ - mkdir ${HOME}/catalyst_clone/ + cd ${HOME}/catalyst_clone/ mkdir build git submodule update --depth=1 --init --recursive cmake -GNinja -DCATALYST_BUILD_TESTING:BOOL=OFF \ diff --git a/debuntu/mini/Dockerfile b/debuntu/mini/Dockerfile index e9c9e8b..c565954 100644 --- a/debuntu/mini/Dockerfile +++ b/debuntu/mini/Dockerfile @@ -98,7 +98,7 @@ if [[ ${sorted[0]} == "$cmake_catalyst_required" ]]; then --single-branch \ https://gitlab.kitware.com/paraview/catalyst.git \ ${HOME}/catalyst_clone/ - mkdir ${HOME}/catalyst_clone/ + cd ${HOME}/catalyst_clone/ mkdir build git submodule update --depth=1 --init --recursive cmake -GNinja -DCATALYST_BUILD_TESTING:BOOL=OFF \ From 95fa26b7e03b50b7d7fbd691687a0a03f34dba1b Mon Sep 17 00:00:00 2001 From: "jacques.morice" Date: Fri, 26 Jun 2026 15:25:50 +0200 Subject: [PATCH 08/12] reduce matrix --- .github/workflows/debuntu_docker_images.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/debuntu_docker_images.yml b/.github/workflows/debuntu_docker_images.yml index 1725881..d27c87c 100644 --- a/.github/workflows/debuntu_docker_images.yml +++ b/.github/workflows/debuntu_docker_images.yml @@ -11,7 +11,8 @@ jobs: strategy: fail-fast: false matrix: - base: ['ubuntu/jammy', 'ubuntu/rolling', 'debian/bookworm', 'debian/unstable'] + #base: ['ubuntu/jammy', 'ubuntu/rolling', 'debian/bookworm', 'debian/unstable'] + base: ['ubuntu/rolling', 'debian/unstable'] mpi: ['openmpi', 'mpich'] variant: ['mini', 'all', 'pdi'] runs-on: ubuntu-latest From 97e9d8b4c43c4e8f7c5928a72808a9c42658fc09 Mon Sep 17 00:00:00 2001 From: "jacques.morice" Date: Fri, 26 Jun 2026 16:06:08 +0200 Subject: [PATCH 09/12] Give Catalyst version in the workflow --- .github/workflows/debuntu_docker_images.yml | 4 +++- debuntu/all/Dockerfile | 7 +++++-- debuntu/mini/Dockerfile | 7 +++++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/debuntu_docker_images.yml b/.github/workflows/debuntu_docker_images.yml index d27c87c..3b98198 100644 --- a/.github/workflows/debuntu_docker_images.yml +++ b/.github/workflows/debuntu_docker_images.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - #base: ['ubuntu/jammy', 'ubuntu/rolling', 'debian/bookworm', 'debian/unstable'] + base: ['ubuntu/jammy', 'ubuntu/rolling', 'debian/bookworm', 'debian/unstable'] base: ['ubuntu/rolling', 'debian/unstable'] mpi: ['openmpi', 'mpich'] variant: ['mini', 'all', 'pdi'] @@ -41,5 +41,7 @@ jobs: MPI=${{ matrix.mpi }} DISTRO=${{ steps.info.outputs.distro }} DISTRO_VERSION=${{ steps.info.outputs.distro_version }} + CMAKE_VERSION_FOR_CATALYST="3.26.0" + CATALYST_VERSION="2.0.0" tags: | ${{ steps.info.outputs.tags }} diff --git a/debuntu/all/Dockerfile b/debuntu/all/Dockerfile index 87a798e..4126fe4 100644 --- a/debuntu/all/Dockerfile +++ b/debuntu/all/Dockerfile @@ -85,9 +85,12 @@ WORKDIR ${HOME} FROM main AS builder_catalyst USER root +ARG CATALYST_VERSION +ARG CMAKE_VERSION_FOR_CATALYST + RUN < Date: Fri, 26 Jun 2026 16:10:05 +0200 Subject: [PATCH 10/12] fix workflow issue --- .github/workflows/debuntu_docker_images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/debuntu_docker_images.yml b/.github/workflows/debuntu_docker_images.yml index 3b98198..c258167 100644 --- a/.github/workflows/debuntu_docker_images.yml +++ b/.github/workflows/debuntu_docker_images.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - base: ['ubuntu/jammy', 'ubuntu/rolling', 'debian/bookworm', 'debian/unstable'] + #base: ['ubuntu/jammy', 'ubuntu/rolling', 'debian/bookworm', 'debian/unstable'] base: ['ubuntu/rolling', 'debian/unstable'] mpi: ['openmpi', 'mpich'] variant: ['mini', 'all', 'pdi'] From 3424e0ec32f93d0e2a5cc3c6bb32c9442718423b Mon Sep 17 00:00:00 2001 From: "jacques.morice" Date: Fri, 26 Jun 2026 19:42:36 +0200 Subject: [PATCH 11/12] cleanup --- .github/workflows/debuntu_docker_images.yml | 5 ++-- debuntu/all/Dockerfile | 4 +-- debuntu/all/build_catalyst.sh | 27 --------------------- debuntu/all/cmake_catalyst.sh | 21 ---------------- debuntu/all/install_catalyst.sh | 12 --------- debuntu/mini/Dockerfile | 4 +-- debuntu/mini/build_catalyst.sh | 27 --------------------- debuntu/mini/cmake_catalyst.sh | 21 ---------------- debuntu/mini/install_catalyst.sh | 12 --------- 9 files changed, 6 insertions(+), 127 deletions(-) delete mode 100644 debuntu/all/build_catalyst.sh delete mode 100644 debuntu/all/cmake_catalyst.sh delete mode 100644 debuntu/all/install_catalyst.sh delete mode 100644 debuntu/mini/build_catalyst.sh delete mode 100644 debuntu/mini/cmake_catalyst.sh delete mode 100644 debuntu/mini/install_catalyst.sh diff --git a/.github/workflows/debuntu_docker_images.yml b/.github/workflows/debuntu_docker_images.yml index c258167..e4f5a2f 100644 --- a/.github/workflows/debuntu_docker_images.yml +++ b/.github/workflows/debuntu_docker_images.yml @@ -11,8 +11,7 @@ jobs: strategy: fail-fast: false matrix: - #base: ['ubuntu/jammy', 'ubuntu/rolling', 'debian/bookworm', 'debian/unstable'] - base: ['ubuntu/rolling', 'debian/unstable'] + base: ['ubuntu/jammy', 'ubuntu/rolling', 'debian/bookworm', 'debian/unstable'] mpi: ['openmpi', 'mpich'] variant: ['mini', 'all', 'pdi'] runs-on: ubuntu-latest @@ -41,7 +40,7 @@ jobs: MPI=${{ matrix.mpi }} DISTRO=${{ steps.info.outputs.distro }} DISTRO_VERSION=${{ steps.info.outputs.distro_version }} - CMAKE_VERSION_FOR_CATALYST="3.26.0" + CMAKE_MINIMAL_VERSION_FOR_CATALYST="3.26.0" CATALYST_VERSION="2.0.0" tags: | ${{ steps.info.outputs.tags }} diff --git a/debuntu/all/Dockerfile b/debuntu/all/Dockerfile index 4126fe4..e8bb850 100644 --- a/debuntu/all/Dockerfile +++ b/debuntu/all/Dockerfile @@ -86,11 +86,11 @@ FROM main AS builder_catalyst USER root ARG CATALYST_VERSION -ARG CMAKE_VERSION_FOR_CATALYST +ARG CMAKE_MINIMAL_VERSION_FOR_CATALYST RUN <= $cmake_catalyst_required" -else - echo "compile cmake" - git clone https://gitlab.kitware.com/cmake/cmake.git local-cmake - cd local-cmake && git checkout v3.30.0 - echo "mkdir install" - mkdir install - echo "mkdir build" - mkdir build && cd build - set -x && ../bootstrap --prefix=../install -- -DCMAKE_USE_OPENSSL=OFF - make -j 8 - make install -fi diff --git a/debuntu/all/install_catalyst.sh b/debuntu/all/install_catalyst.sh deleted file mode 100644 index 0c6788a..0000000 --- a/debuntu/all/install_catalyst.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -set -x -cmake_catalyst_required=3.26.0 -cmake_installed=$(cmake --version | head -1 | cut -f3 -d" ") - -mapfile -t sorted < <(printf "%s\n" "$cmake_installed" "$cmake_catalyst_required" | sort -V) - -if [[ ${sorted[0]} == "$cmake_catalyst_required" ]]; then - cmake --install ${HOME}/catalyst_clone/build -else - /home/ci/local-cmake/install/bin/cmake --install ${HOME}/catalyst_clone/build -fi diff --git a/debuntu/mini/Dockerfile b/debuntu/mini/Dockerfile index dfe3c93..2a0adfd 100644 --- a/debuntu/mini/Dockerfile +++ b/debuntu/mini/Dockerfile @@ -77,11 +77,11 @@ FROM main AS builder_catalyst USER root ARG CATALYST_VERSION -ARG CMAKE_VERSION_FOR_CATALYST +ARG CMAKE_MINIMAL_VERSION_FOR_CATALYST RUN <= $cmake_catalyst_required" -else - echo "compile cmake" - git clone https://gitlab.kitware.com/cmake/cmake.git local-cmake - cd local-cmake && git checkout v3.30.0 - echo "mkdir install" - mkdir install - echo "mkdir build" - mkdir build && cd build - set -x && ../bootstrap --prefix=../install -- -DCMAKE_USE_OPENSSL=OFF - make -j 8 - make install -fi diff --git a/debuntu/mini/install_catalyst.sh b/debuntu/mini/install_catalyst.sh deleted file mode 100644 index 0c6788a..0000000 --- a/debuntu/mini/install_catalyst.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -set -x -cmake_catalyst_required=3.26.0 -cmake_installed=$(cmake --version | head -1 | cut -f3 -d" ") - -mapfile -t sorted < <(printf "%s\n" "$cmake_installed" "$cmake_catalyst_required" | sort -V) - -if [[ ${sorted[0]} == "$cmake_catalyst_required" ]]; then - cmake --install ${HOME}/catalyst_clone/build -else - /home/ci/local-cmake/install/bin/cmake --install ${HOME}/catalyst_clone/build -fi From f8f094ed286c130de3053e7dc79bed15ab670871 Mon Sep 17 00:00:00 2001 From: "jacques.morice" Date: Mon, 29 Jun 2026 12:20:35 +0200 Subject: [PATCH 12/12] homogenity between mini and all --- debuntu/all/Dockerfile | 2 -- debuntu/mini/Dockerfile | 6 +----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/debuntu/all/Dockerfile b/debuntu/all/Dockerfile index e8bb850..d3b00b6 100644 --- a/debuntu/all/Dockerfile +++ b/debuntu/all/Dockerfile @@ -144,6 +144,4 @@ ENV catalyst_dir="/opt/catalyst/lib/cmake/catalyst-2.0" RUN export VERBOSE=1 \ && bash pdi/bin/build_and_run_all_tests - - FROM main diff --git a/debuntu/mini/Dockerfile b/debuntu/mini/Dockerfile index 2a0adfd..5caee9c 100644 --- a/debuntu/mini/Dockerfile +++ b/debuntu/mini/Dockerfile @@ -72,7 +72,6 @@ ENV HOME=/home/ci USER ci:ci WORKDIR ${HOME} -## chmod -R o+rX . FROM main AS builder_catalyst USER root @@ -117,15 +116,13 @@ else fi EORUN -USER ci - FROM alpine/git AS pdidl #RUN git -C /root clone --recurse-submodules https://github.com/pdidev/pdi.git /root/pdi RUN git -C /root clone -b catalyst-plugin --recurse-submodules https://github.com/francois-kitware/pdi /root/pdi FROM main AS test - +USER ci COPY --from=pdidl --chown=ci:ci /root/pdi /home/ci/pdi COPY --from=builder_catalyst --chown=ci:ci /opt/catalyst /opt/catalyst @@ -133,7 +130,6 @@ WORKDIR ${HOME} ## Add env varible for catalyst lib ENV LD_LIBRARY_PATH="/opt/catalyst/lib" ENV catalyst_dir="/opt/catalyst/lib/cmake/catalyst-2.0" -## add to check if catalyst_dir is needed RUN export VERBOSE=1 \ && bash pdi/bin/build_and_run_all_tests