Patch VTK 9.4 build on resolute - #129
Merged
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the custom Ubuntu setup and dependency install scripts to support building newer dependency stacks (notably around VTK/netCDF compatibility and tooling needed for patching/version detection), aligning with the portability image maintenance workflow.
Changes:
- Add
patchandpkg-configto Ubuntu 22.04/24.04/26.04 setup scripts. - Introduce and conditionally apply a VTK 9.4 patch to handle netCDF’s
_FillValue→NC_FillValuemacro change (netCDF ≥ 4.9.3). - Simplify multiple installer scripts by removing
&& \chaining (relying on#!/bin/bash -eufor fail-fast behavior).
Reviewed changes
Copilot reviewed 12 out of 12 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| scripts/custom/setup_ubuntu_2604.sh | Installs patch/pkg-config needed for applying patches and querying library versions on Ubuntu 26.04 images. |
| scripts/custom/setup_ubuntu_2404.sh | Same tooling additions for Ubuntu 24.04 images. |
| scripts/custom/setup_ubuntu_2204.sh | Same tooling additions for Ubuntu 22.04 images. |
| scripts/custom/patches/vtk/9.4/netcdf-fillvalue.patch | Adds a patch to fix VTK bundled exodusII compilation with netCDF ≥ 4.9.3. |
| scripts/custom/install_xercesc.sh | Removes command chaining while preserving fail-fast behavior under -e. |
| scripts/custom/install_vtk.sh | Adds conditional VTK 9.4 netCDF macro patching and removes command chaining in build steps. |
| scripts/custom/install_sundials.sh | Removes command chaining in build steps. |
| scripts/custom/install_python.sh | Removes command chaining in build steps. |
| scripts/custom/install_petsc.sh | Removes command chaining after PETSc configure invocation. |
| scripts/custom/install_hdf5.sh | Removes command chaining and slightly restructures build directory creation/cd steps. |
| scripts/custom/install_cmake.sh | Removes command chaining in build steps. |
| scripts/custom/install_boost.sh | Removes command chaining in bootstrap/build steps. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
kwabenantim
marked this pull request as ready for review
July 29, 2026 06:57
kwabenantim
changed the title
Member
Author
|
This patch has been successfully applied in the docker rebuild of the portability-05 image: https://github.com/Chaste/dependency-modules/actions/runs/30409214949 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #128