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

targeting 9c96d17 MOAB commit instead of version 5.1 #740

Merged
merged 7 commits into from
Jun 17, 2021
Merged

targeting 9c96d17 MOAB commit instead of version 5.1 #740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
02f82e6
targeting 9c96d17 MOAB commit instead of version 5.1
bam241 Jun 15, 2021
32d920c
news
bam241 Jun 15, 2021
e2c1352
missing the proper argument in the auto build:(
bam241 Jun 15, 2021
9620c8c
I need the branch varibale...
bam241 Jun 15, 2021
1c6bca9
that should do it
bam241 Jun 15, 2021
33072e6
that should do it
bam241 Jun 15, 2021
8fe4b08
update CI MOAB target
bam241 Jun 16, 2021
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
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ workflows:
img: [ "16.04", "18.04"]
compiler: ["clang", "gcc"]
hdf5: ["1.10.4"]
moab: ["5.1.0"]
moab: ["9c96d17"]
Copy link
Member

Choose a reason for hiding this comment

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

I don't know enough about CI/yaml to know if this can be defined only once in this file and reused???

requires:
- house_keeping
filters:
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions CI/Dockerfile_3_moab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

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

doesn't this get overridden by the env variable when called via update_docker.sh. Therefore, this could keep 5.1.0 as the default, but the value is changed in the script?

ENV MOAB_VERSION ${MOAB}
RUN if [ "${MOAB_VERSION}" != "master" ] && [ "${MOAB_VERSION}" != "develop" ]; then \
/root/etc/CI/docker/build_moab.sh; \
Expand Down
7 changes: 5 additions & 2 deletions CI/docker/build_moab.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion CI/update_docker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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} \
Expand Down
12 changes: 12 additions & 0 deletions news/PR-0740.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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