From 56f03a770620e7ea0256d420a61e10bc8d1afc8a Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 31 Aug 2023 09:01:56 -0500 Subject: [PATCH 1/5] Adding reorder flag to CI builds --- .github/workflows/linux_build_test.yml | 1 + .github/workflows/mac_build_test.yml | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/linux_build_test.yml b/.github/workflows/linux_build_test.yml index 51fbd0a598..0f4a9f5d89 100644 --- a/.github/workflows/linux_build_test.yml +++ b/.github/workflows/linux_build_test.yml @@ -76,6 +76,7 @@ jobs: -DCMAKE_Fortran_COMPILER=gfortran \ -DCMAKE_INSTALL_PREFIX=${install_dir}/dagmc \ -DDOUBLE_DOWN=${double_down} \ + -DCMAKE_CXX_FLAGS="-Wreorder" \ -Ddd_ROOT=${double_down_install_dir} && \ make -j2 && \ make install diff --git a/.github/workflows/mac_build_test.yml b/.github/workflows/mac_build_test.yml index 8703829cf3..109f56b696 100644 --- a/.github/workflows/mac_build_test.yml +++ b/.github/workflows/mac_build_test.yml @@ -51,7 +51,7 @@ jobs: shell: bash -l {0} run: | echo "HOME=$GITHUB_WORKSPACE/.." >> $GITHUB_ENV - + - name: Build MOAB shell: bash -l {0} @@ -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="-Wreorder" \ + -DCMAKE_INSTALL_PREFIX=${HOME}/dagmc make make install @@ -91,4 +92,3 @@ jobs: run: | cd $GITHUB_WORKSPACE/bld PATH=$GITHUB_WORKSPACE/bld/bin:$PATH make test - From cd98a30d8a5b4fb35e0e2633a7c6fe1989d90b0c Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 31 Aug 2023 09:05:41 -0500 Subject: [PATCH 2/5] Update changelog --- doc/CHANGELOG.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst index 3ec4626740..8414dad8db 100644 --- a/doc/CHANGELOG.rst +++ b/doc/CHANGELOG.rst @@ -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) @@ -57,7 +58,7 @@ v3.2.1 **Removed:** **Fixed:** - + **Security:** **Maintenance:** From b8c980bead18ed875026930b693419520f8897d6 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 31 Aug 2023 09:39:21 -0500 Subject: [PATCH 3/5] Correcting flag --- .github/workflows/linux_build_test.yml | 2 +- .github/workflows/mac_build_test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/linux_build_test.yml b/.github/workflows/linux_build_test.yml index 0f4a9f5d89..60c643d8a2 100644 --- a/.github/workflows/linux_build_test.yml +++ b/.github/workflows/linux_build_test.yml @@ -76,7 +76,7 @@ jobs: -DCMAKE_Fortran_COMPILER=gfortran \ -DCMAKE_INSTALL_PREFIX=${install_dir}/dagmc \ -DDOUBLE_DOWN=${double_down} \ - -DCMAKE_CXX_FLAGS="-Wreorder" \ + -DCMAKE_CXX_FLAGS="-Werror=reorder" \ -Ddd_ROOT=${double_down_install_dir} && \ make -j2 && \ make install diff --git a/.github/workflows/mac_build_test.yml b/.github/workflows/mac_build_test.yml index 109f56b696..3bf6f40f23 100644 --- a/.github/workflows/mac_build_test.yml +++ b/.github/workflows/mac_build_test.yml @@ -82,7 +82,7 @@ jobs: -DBUILD_STATIC_EXE=OFF \ -DBUILD_SHARED_LIBS=ON \ -DBUILD_STATIC_LIBS=OFF \ - -DCMAKE_CXX_FLAGS="-Wreorder" \ + -DCMAKE_CXX_FLAGS="-Werror=reorder" \ -DCMAKE_INSTALL_PREFIX=${HOME}/dagmc make make install From f16c8660595488d20d1f15d5f3ac5c528e0eea31 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 31 Aug 2023 09:46:54 -0500 Subject: [PATCH 4/5] Fix ordering of attribute initialization --- src/dagmc/dagmcmetadata.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dagmc/dagmcmetadata.cpp b/src/dagmc/dagmcmetadata.cpp index 3392901011..b2753cf2f8 100644 --- a/src/dagmc/dagmcmetadata.cpp +++ b/src/dagmc/dagmcmetadata.cpp @@ -12,8 +12,8 @@ dagmcMetaData::dagmcMetaData(moab::DagMC* dag_ptr, bool verbosity, bool require_density_present) : DAG(dag_ptr), - logger(verbosity), - require_density(require_density_present) { + require_density(require_density_present), + logger(verbosity) { // these are the keywords that dagmc will understand // from groups if you need to process more // they should be added here From 25bac6b8bfcca9b83c1d2c9794d1963b0ccd7cc9 Mon Sep 17 00:00:00 2001 From: Patrick Shriwise Date: Thu, 31 Aug 2023 09:52:37 -0500 Subject: [PATCH 5/5] Update changelog --- doc/CHANGELOG.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/CHANGELOG.rst b/doc/CHANGELOG.rst index 8414dad8db..8e097a8125 100644 --- a/doc/CHANGELOG.rst +++ b/doc/CHANGELOG.rst @@ -26,6 +26,7 @@ Next version * 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) + * Fixing order of attribute initialization in the metadata class (#903) **Fixed:** * Patch to compile with Geant4 10.6 (#803)