Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/linux_build_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ jobs:
-DCMAKE_Fortran_COMPILER=gfortran \
-DCMAKE_INSTALL_PREFIX=${install_dir}/dagmc \
-DDOUBLE_DOWN=${double_down} \
-DCMAKE_CXX_FLAGS="-Werror=reorder" \
-Ddd_ROOT=${double_down_install_dir} && \
make -j2 && \
make install
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/mac_build_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
shell: bash -l {0}
run: |
echo "HOME=$GITHUB_WORKSPACE/.." >> $GITHUB_ENV


- name: Build MOAB
shell: bash -l {0}
Expand All @@ -78,11 +78,12 @@ jobs:
mkdir -p $GITHUB_WORKSPACE/bld
cd $GITHUB_WORKSPACE/bld
cmake ../ -DMOAB_DIR=${HOME}/moab \
-DBUILD_CI_TESTS=ON \
-DBUILD_STATIC_EXE=OFF \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_STATIC_LIBS=OFF \
-DCMAKE_INSTALL_PREFIX=${HOME}/dagmc
-DBUILD_CI_TESTS=ON \
-DBUILD_STATIC_EXE=OFF \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_STATIC_LIBS=OFF \
-DCMAKE_CXX_FLAGS="-Werror=reorder" \
-DCMAKE_INSTALL_PREFIX=${HOME}/dagmc
make
make install

Expand All @@ -91,4 +92,3 @@ jobs:
run: |
cd $GITHUB_WORKSPACE/bld
PATH=$GITHUB_WORKSPACE/bld/bin:$PATH make test

3 changes: 2 additions & 1 deletion doc/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Next version
* Streamline CI to take advantage of better docker image management (#880, #896)
* Move more CI from scripts to actions (#895)
* Add double-down to test-on-merge (#898)
* Adding flags to CI to ensure compatibility with MOOSE apps (#902)

**Fixed:**
* Patch to compile with Geant4 10.6 (#803)
Expand Down Expand Up @@ -57,7 +58,7 @@ v3.2.1
**Removed:**

**Fixed:**

**Security:**

**Maintenance:**
Expand Down