Skip to content
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

propagating hdf5 version update to CI #978

Merged
merged 8 commits into from
Feb 14, 2025
Merged

propagating hdf5 version update to CI #978

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bd03bdb
propagating hdf5 version update to CI
bam241 Feb 14, 2025
2df4b06
removing moab mention at the end of the container name
bam241 Feb 14, 2025
28258ac
there is a v before geant4 version ref
bam241 Feb 14, 2025
ecd48c6
updating geant4 version for proper match with what we build
bam241 Feb 14, 2025
f696121
DOUBLE_DOWN_INSTALL_DIR back to capital
bam241 Feb 14, 2025
b5cd71b
readd missing caps for variable
bam241 Feb 14, 2025
3afd9f8
reading the moab container in the name
bam241 Feb 14, 2025
48b9cc4
external_deps extension ?
bam241 Feb 14, 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
2 changes: 1 addition & 1 deletion .github/actions/upstream-test/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ inputs:
hdf5_version:
description: Version of HDF5
required: false
default: hdf5_1_14_3
default: 1.14.6
moab_version:
description: Version of MOAB
required: false
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/linux_build_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
clang,
]
hdf5_version : [
1.14.3,
1.14.6,
]
moab_version : [
5.4.1,
Expand All @@ -54,8 +54,8 @@ jobs:
off,
]
geant4_version : [
10.7.4,
11.1.2
v10.7.4,
v11.2.1
]
double_down_version : [
off,
Expand All @@ -64,7 +64,7 @@ jobs:
include:
- ubuntu_version: 22.04
compiler: gcc
hdf5_version: 1.14.3
hdf5_version: 1.14.6
moab_version: 5.4.1
pull_install_moab: on
geant4_version: off
Expand All @@ -83,7 +83,7 @@ jobs:
matrix.geant4_version
}}-double_down_${{
matrix.double_down_version
}}/moab:latest
}}:latest
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm a little concerned about this, because it means building DAGMC in a container that already has DAGMC installed.... The moab descriptor should be from a version of the build that stopped at MOAB


steps:
- name: Checkout repository
Expand All @@ -97,10 +97,10 @@ jobs:
mkdir -p build
cd build
cmake ../ \
-DMOAB_DIR=${moab_install_dir} \
-DMOAB_DIR=${MOAB_INSTALL_DIR} \
-DBUILD_GEANT4=$([ "${{ matrix.geant4_version }}" != "off" ] && echo "ON" || echo "OFF") \
-DPULL_INSTALL_MOAB=$([ "${{ matrix.pull_install_moab }}" != "on" ] && echo "OFF" || echo "ON -DHDF5_ROOT=${hdf5_install_dir}") \
-DGEANT4_DIR=${geant4_install_dir} \
-DPULL_INSTALL_MOAB=$([ "${{ matrix.pull_install_moab }}" != "on" ] && echo "OFF" || echo "ON -DHDF5_ROOT=${HDF5_INSTALL_DIR}") \
-DGEANT4_DIR=${GEANT4_INSTALL_DIR} \
-DBUILD_CI_TESTS=ON \
-DBUILD_MW_REG_TESTS=OFF \
-DBUILD_STATIC_EXE=OFF \
Expand All @@ -110,7 +110,7 @@ jobs:
-DCMAKE_Fortran_COMPILER=gfortran \
-DCMAKE_INSTALL_PREFIX=${install_dir}/dagmc \
-DDOUBLE_DOWN=$([ "${{ matrix.double_down_version }}" != "off" ] && echo "ON" || echo "OFF") \
-Ddd_ROOT=${double_down_install_dir}
-Ddd_ROOT=${DOUBLE_DOWN_INSTALL_DIR}
make -j${CI_JOBS}
make install

Expand Down
2 changes: 1 addition & 1 deletion doc/CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Next version

**Changed:**
* Update formating of few files to comply with clang-format (#937)
* Update default HDF5 version to 1.14.6 (#976)
* Update default HDF5 version to 1.14.6 (#976, #978)

**Added:**
* Allow download & build of MOAB from cmake at build time (#969)
Expand Down