Merge pull request #740 from bam241/moab_update

svalinn · Jun 17, 2021 · 3401ad9 · 3401ad9
2 parents a077ae7 + 8fe4b08
commit 3401ad9
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 7 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -79,7 +79,7 @@ workflows:
               img: [ "16.04", "18.04"]
               compiler: ["clang", "gcc"]
               hdf5: ["1.10.4"]
-              moab: ["5.1.0"]
+              moab: ["9c96d17"]
           requires:
             - house_keeping
           filters:
@@ -95,7 +95,7 @@ workflows:
               img: [ "16.04", "18.04"]
               compiler: ["clang", "gcc"]
               hdf5: ["1.10.4"]
-              moab: ["5.1.0", "develop", "master"]
+              moab: ["9c96d17", "develop", "master"]
           filters:
             branches:
               only: develop

diff --git a/CI/Dockerfile_3_moab b/CI/Dockerfile_3_moab
@@ -7,8 +7,8 @@ FROM svalinn/dagmc-ci-ubuntu-${UBUNTU_VERSION}-${COMPILER}-ext-hdf5_${HDF5}
 ENV moab_build_dir=${build_dir}/moab
 ENV moab_install_dir=${install_dir}/moab
 
-# MOAB Verions: 5.1.0
-ARG MOAB=5.1.0
+# MOAB Commit: 9c96d17 (Merged commit of @pshriwise thread fix)
+ARG MOAB=9c96d17
 ENV MOAB_VERSION ${MOAB}
 RUN if [ "${MOAB_VERSION}" != "master" ] && [ "${MOAB_VERSION}" != "develop" ]; then \
         /root/etc/CI/docker/build_moab.sh; \

diff --git a/CI/docker/build_moab.sh b/CI/docker/build_moab.sh
@@ -7,14 +7,17 @@ source ${docker_env}
 if [ ${MOAB_VERSION} == "master" ] || [ ${MOAB_VERSION} == "develop" ]; then
   branch=${MOAB_VERSION}
 else
-  branch=Version${MOAB_VERSION}
+#  branch=Version${MOAB_VERSION}
+  branch=${MOAB_VERSION}
 fi
 
 rm -rf ${moab_build_dir}/bld ${moab_install_dir}
 mkdir -p ${moab_build_dir}/bld
 cd ${moab_build_dir}
-git clone --depth 1 https://bitbucket.org/fathomteam/moab -b ${branch}
+#git clone --depth 1 https://bitbucket.org/fathomteam/moab -b ${branch}
+git clone https://bitbucket.org/fathomteam/moab 
 cd moab
+git checkout ${branch}
 autoreconf -fi
 cd ../bld
 ../moab/configure --enable-pymoab \

diff --git a/CI/update_docker.sh b/CI/update_docker.sh
@@ -18,7 +18,7 @@ done
 ubuntu_versions="16.04 18.04"
 compilers="gcc clang"
 hdf5_versions="1.10.4"
-moab_versions="5.1.0 develop master"
+moab_versions="9c96d17 develop master"
 for ubuntu_version in ${ubuntu_versions}; do
   image_name="svalinn/dagmc-ci-ubuntu-${ubuntu_version}"
   docker build -t ${image_name} --build-arg UBUNTU_VERSION=${ubuntu_version} \

diff --git a/news/PR-0740.rst b/news/PR-0740.rst
@@ -0,0 +1,12 @@
+**Added:** None
+
+**Changed:** 
+- docker stack now checks out commit 9c96d17 (Merged commit of @pshriwise thread fix)
+
+**Deprecated:** None
+
+**Removed:** None
+
+**Fixed:** None
+
+**Security:** None