Skip to content

Commit

Permalink
Update doxygen version in docker image. (#840)
Browse files Browse the repository at this point in the history
* Update doxygen version in docker image.

+ The docker image has a different version of doxygen than the ccs-net
  machines.  This occasionally results in different nightly regression and CI
  behavior for the autodoc target.
+ Update doxygen in the docker image to 1.8.14 to match ccs-net.

* missed a ref to the docker image. fixed.
  • Loading branch information
KineticTheory authored May 21, 2020
1 parent 5866bb3 commit a385f9c
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,11 @@ jobs:
# - if [[ ${COVERAGE} ]]; then pip install --user codecov; fi

install:
- travis_retry timeout 540 docker pull kinetictheory/draco-ci-2019aug
- travis_retry timeout 540 docker pull kinetictheory/draco-ci-2020may

script:
- if [[ ${COVERAGE:-OFF} == "ON" ]]; then ci_env=`/bin/bash <(curl -s https://codecov.io/env)`; fi
- docker run ${ci_env} -v ${T_SOURCE_DIR}:${SOURCE_DIR} -e VENDOR_DIR=${VENDOR_DIR} -e BUILD_DIR=${BUILD_DIR} -e SOURCE_DIR=${SOURCE_DIR} -e STYLE=${STYLE} -e COVERAGE=${COVERAGE} -e WERROR=${WERROR} -e DRACO_C4=${DRACO_C4} -e AUTODOC=${AUTODOC} -e CI=${CI} -e TRAVIS=${TRAVIS} -e TRAVIS_BRANCH=${TRAVIS_BRANCH} -e GCCVER=${GCCVER} -e CI_MERGE_REQUEST_TARGET_BRANCH_NAME=${CI_MERGE_REQUEST_TARGET_BRANCH_NAME} kinetictheory/draco-ci-2020april /bin/bash -l -c "${SOURCE_DIR}/tools/travis-run-tests.sh"
- docker run ${ci_env} -v ${T_SOURCE_DIR}:${SOURCE_DIR} -e VENDOR_DIR=${VENDOR_DIR} -e BUILD_DIR=${BUILD_DIR} -e SOURCE_DIR=${SOURCE_DIR} -e STYLE=${STYLE} -e COVERAGE=${COVERAGE} -e WERROR=${WERROR} -e DRACO_C4=${DRACO_C4} -e AUTODOC=${AUTODOC} -e CI=${CI} -e TRAVIS=${TRAVIS} -e TRAVIS_BRANCH=${TRAVIS_BRANCH} -e GCCVER=${GCCVER} -e CI_MERGE_REQUEST_TARGET_BRANCH_NAME=${CI_MERGE_REQUEST_TARGET_BRANCH_NAME} kinetictheory/draco-ci-2020may /bin/bash -l -c "${SOURCE_DIR}/tools/travis-run-tests.sh"

#------------------------------------------------------------------------------#
# See also:
Expand Down
14 changes: 7 additions & 7 deletions tools/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ FROM ubuntu:latest
# This image:
# 1. cd /D f:\work\docker (copy Dockerfile and packages.yaml to this location).
# 2. docker login -u kinetictheory (and password) # ref https://docs.docker.com/get-started/part2/
# 3. docker build --rm --pull --tag draco-ci-2020april:latest .
# OR: docker run -it -v /c/work:/work kinetictheory/draco-ci-2019aug /bin/bash -l
# 3. docker build --rm --pull --tag draco-ci-2020may:latest .
# OR: docker run -it -v /c/work:/work kinetictheory/draco-ci-2020may /bin/bash -l
# apt-get install -y --no-install-recommends [ghostview]
# rm -rf /vendors/spack/var/spack/repos/builtin/cmake
# cp -r /work/kinetictheory/spack/var/spack/repos/builtin/cmake /vendors/spack/var/spack/repos/builtin/.
# spack install [email protected]
# exit
# docker ps -a
# docker commit -m "added cmake-3.17.0." kind_grothen kinetictheory/draco-ci-2020april:latest
# docker push kinetictheory/draco-ci-2020april:latest
# docker commit -m "added cmake-3.17.0." kind_grothen kinetictheory/draco-ci-2020may:latest
# docker push kinetictheory/draco-ci-2020may:latest
# 4. docker image ls -a ==> find container name (or docker ps)
# 5. docker commit -m "added sphinx and mscgen" -a kinetictheory <hash> kinetictheory/draco-ci-2020april:latest # queues for upload
# 6. docker push kinetictheory/draco-ci-2020april:latest
# 5. docker commit -m "added sphinx and mscgen" -a kinetictheory <hash> kinetictheory/draco-ci-2020may:latest # queues for upload
# 6. docker push kinetictheory/draco-ci-2020may:latest
# 7. docker system prune -a (remove old dangling data)

MAINTAINER KineticTheory "https://github.com/KineticTheory"
Expand All @@ -33,7 +33,7 @@ MAINTAINER KineticTheory "https://github.com/KineticTheory"
ENV DEBIAN_FRONTEND noninteractive
ENV DEBCONF_NONINTERACTIVE_SEEN true
ENV SPACK_ROOT=/vendors/spack
ENV DRACO_TPL="[email protected] gsl numdiff [email protected] openmpi netlib-lapack metis parmetis mscgen libquo [email protected] lcov"
ENV DRACO_TPL="[email protected] gsl numdiff [email protected] openmpi netlib-lapack metis parmetis mscgen libquo [email protected] lcov [email protected]"
ENV FORCE_UNSAFE_CONFIGURE=1
ENV DISTRO=bionic
ENV CLANG_FORMAT_VER=6.0
Expand Down

0 comments on commit a385f9c

Please sign in to comment.