Skip to content

Commit

Permalink
updating dockerfile and travis
Browse files Browse the repository at this point in the history
  • Loading branch information
LouisJenkinsCS committed Jun 11, 2019
1 parent 00a3053 commit 7ed4a57
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,15 @@ jobs:
include:
- script: |
# TODO - how to get performance folder from current gh-pages to not get overwritten. Do we need to clone branch & copy it in?
docker run -it -v ${TRAVIS_BUILD_DIR}:/repo.git -w /repo.git louisjenkinscs/chapel-experimental:chapel-1.19 /bin/bash -c '
docker build -t docker/gasnet-experimental/
docker run -it -v ${TRAVIS_BUILD_DIR}:/repo.git -w /repo.git -d gasnet-experimental /bin/bash -c '
pushd $CHPL_HOME
. util/setchplenv.sh
popd
chpldoc src/*.chpl
touch docs/.nojekyll
cd test
chpl --version
export CHPL_UNWIND=libunwind
export GASNET_BACKTRACE=1
start_test -junit-xml -numlocales 4'
deploy:
Expand Down
10 changes: 6 additions & 4 deletions Dockerfile → docker/gasnet-experimental/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
FROM chapel/chapel:latest

ENV QT_AFFINITY no
ENV QT_SPINCOUNT 300
ENV GASNET_SPAWNFN L
ENV CHPL_UNWIND libunwind
ENV GASNET_BACKTRACE 1
ENV CHPL_COMM gasnet
ENV CHPL_GASNET_SUBSTRATE fast
ENV CHPL_GASNET_SEGMENT fast

RUN make -C $CHPL_HOME \
&& make -C $CHPL_HOME chpldoc test-venv mason \
&& make -C $CHPL_HOME cleanall

ENV QT_AFFINITY no
ENV QT_SPINCOUNT 300
ENV GASNET_SPAWNFN L

0 comments on commit 7ed4a57

Please sign in to comment.