diff --git a/.gitsuper b/.gitsuper index b638dfcc1b50573af7125de2680e064241fd08bb..0abaa73dceebc297e123590e1809d7ddd81b29d7 100644 --- a/.gitsuper +++ b/.gitsuper @@ -4,7 +4,7 @@ status = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8 bin (heads/master) 8495540a687b3ee1f7f9a6298d6a5faea51ac069 config.opts (8495540) 8f2c5aba441417bf2c42f22272f538c68a89cc4a dune-alugrid (remotes/origin/releases/2.5) 707acf201d5a754c80f87cc4d71aa36bf29a6e3f dune-common (v2.5.1-9-g707acf20) - +7d5d0b29e358d19a84dae8372b386b24187af0cd dune-gdt (heads/refactor-space-interface_drone) + +999950337e5debcbed11a4c38a3ab843fded4830 dune-gdt (heads/refactor-space-interface_drone) 390a2c503783bbed778a8ff610f8c5ca09c238d0 dune-geometry (v2.5.1-5-g390a2c5) d7b20bbc5f6fdcfc312beb0ea5d16d39ea26904e dune-grid (v2.5.1-2-gd7b20bbc5) 9e29a333e8af02382d80b95335a784d5ce1ea2c8 dune-grid-glue (v2.4.0-70-g9e29a33) @@ -44,7 +44,7 @@ commit = 707acf201d5a754c80f87cc4d71aa36bf29a6e3f [submodule.dune-gdt] remote = https://github.com/dune-community/dune-gdt.git status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master) -commit = 7d5d0b29e358d19a84dae8372b386b24187af0cd +commit = 999950337e5debcbed11a4c38a3ab843fded4830 [submodule.dune-geometry] remote = https://github.com/dune-community/dune-geometry.git diff --git a/.travis.yml b/.travis.yml index 8d2a0fca2d74538f204c989d65b2362b1df35ad2..9a213277245e296093b18fea83592a95cb79ee67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,11 +16,11 @@ services: docker install: - export BASEIMAGE="${MY_MODULE}-testing_base_${CC}:${TRAVIS_BRANCH}" - - export IMAGE="${MY_MODULE}-testing_${CC}:${TRAVIS_COMMIT}" + - export IMAGE="dunecommunity/${MY_MODULE}-testing_${CC}:${TRAVIS_COMMIT}" - ./.travis.add_swap.bash 2000 & # get image with fallback to master branch of the super repo - docker pull dunecommunity/${BASEIMAGE} || export BASEIMAGE="${MY_MODULE}-testing_base_${CC}:master" ; docker pull dunecommunity/${BASEIMAGE} - - docker build --build-arg BASE=${BASEIMAGE} -t dunecommunity/${IMAGE} -f .ci/docker/Dockerfile . + - docker build --build-arg BASE=${BASEIMAGE} -t ${IMAGE} -f .ci/docker/Dockerfile . # for add swap - wait - export ENV_FILE=${HOME}/env diff --git a/.travis.yml.py b/.travis.yml.py index 7e6abe71ae016c4786724d374729875258acfc71..221a8c0c70d44bdd7df3068724fcc738eb1fb071 100755 --- a/.travis.yml.py +++ b/.travis.yml.py @@ -30,11 +30,11 @@ services: docker install: - export BASEIMAGE="${MY_MODULE}-testing_base_${CC}:${TRAVIS_BRANCH}" - - export IMAGE="${MY_MODULE}-testing_${CC}:${TRAVIS_COMMIT}" + - export IMAGE="dunecommunity/${MY_MODULE}-testing_${CC}:${TRAVIS_COMMIT}" - ./.travis.add_swap.bash 2000 & # get image with fallback to master branch of the super repo - docker pull dunecommunity/${BASEIMAGE} || export BASEIMAGE="${MY_MODULE}-testing_base_${CC}:master" ; docker pull dunecommunity/${BASEIMAGE} - - docker build --build-arg BASE=${BASEIMAGE} -t dunecommunity/${IMAGE} -f .ci/docker/Dockerfile . + - docker build --build-arg BASE=${BASEIMAGE} -t ${IMAGE} -f .ci/docker/Dockerfile . # for add swap - wait - export ENV_FILE=${HOME}/env