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

Jump to bottom

prepend pythonpath as fix for MOAB build #4

Merged
merged 11 commits into from
Sep 1, 2022
Merged

prepend pythonpath as fix for MOAB build #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
421e7ad
prepend pythonpath as fix for MOAB build
gonuke Aug 27, 2022
48a97a0
keep previous pythonpath as well
gonuke Aug 27, 2022
f77d721
whitespace change to changelog
gonuke Aug 27, 2022
dc2945c
correct pythonpath
gonuke Aug 28, 2022
de0f876
need to mkdir for temp install
gonuke Aug 29, 2022
0b20fb3
add pythonpath for install as well
gonuke Aug 29, 2022
10162c5
comment out env source b/c it should all be in docker image
gonuke Aug 30, 2022
da899cc
Add build and install dir to the environment
gonuke Aug 30, 2022
5a84ef1
define build_dir from env
gonuke Aug 30, 2022
f5c70dd
read build dir from the env
gonuke Aug 30, 2022
488bf87
workflow changes to correct directory
gonuke Aug 30, 2022
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
10 changes: 8 additions & 2 deletions CI/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@ RUN apt-get -y update; \
update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 10; \
pip install cython;

ARG build_dir
ARG install_dir

ENV build_dir=${build_dir}
ENV install_dir=${install_dir}

FROM base as external_deps

Expand Down Expand Up @@ -185,8 +190,9 @@ RUN mkdir -p ${moab_build_dir}/build && \
-DBUILD_SHARED_LIBS=ON \
-DENABLE_FORTRAN=OFF \
-DENABLE_PYMOAB=ON && \
make -j${ci_jobs} && \
make install && \
mkdir -p ${moab_build_dir}/build/pymoab/lib/python3.6/site-packages && \
PYTHONPATH=${moab_build_dir}/build/pymoab/lib/python3.6/site-packages:${PYTHONPATH} make -j${ci_jobs} && \
PYTHONPATH=${moab_build_dir}/build/pymoab/lib/python3.6/site-packages:${PYTHONPATH} make install && \
cd && \
rm -rf ${moab_build_dir}

Expand Down
4 changes: 0 additions & 4 deletions CI/scripts/housekeeping.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@

set -ex

source ${docker_env}

cd ${dagmc_build_dir}

# Ensure clang-format is there
if ! command -v clang-format &> /dev/null
then
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 @@ -12,7 +12,7 @@ Next version
* Using multi stage Dockerfile to reduce the number of Dockerfile (#813)
* Adding safe folder to allow CI to compile DAGMC (#814)
* Correction to CMake variable name in OpenMC install instructions (#817)
* Move install scripts into Dockerfile (#822)
* Move install scripts into Dockerfile (#822)
* Updating documentation publishing URL (#823)


Expand Down