diff --git a/.gitsuper b/.gitsuper index 8c5c3c47b924412d6f87d96aa34bfbddfbcb0d29..0b5b75c54fb8e861e192e068611be4d30b1959a4 100644 --- a/.gitsuper +++ b/.gitsuper @@ -12,7 +12,7 @@ status = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8 bin (heads/master) 6d2a4680493a2483d53f9dd05a19dd6b5f436572 dune-pybindxi (v2.2.1-30-g6d2a468) 58bd932e2311a288e0163d041f836b50f19111cb dune-testtools (remotes/origin/testname_listing_hack2.6) 07f9700459c616186737a9a34277f2edee76f475 dune-uggrid (v2.6.0-1-g07f97004) - +20f5e1f0d88d3ca11c525bdc0daaf6b5efe4b102 dune-xt-common (heads/azure-ci) + +bce0e2eb9b06a623fe09251712c27b864255b48c dune-xt-common (heads/azure-ci) 0307552d17c4d383d218b8e1a2d1064a2768ddd7 dune-xt-data (heads/master) +c3e505603bb8e98af381546d7faffd116e24c0c3 dune-xt-functions (heads/bin_update) 54c306274f4253477d0116490c0c812d6db1b31d dune-xt-grid (heads/master) @@ -83,7 +83,7 @@ commit = 07f9700459c616186737a9a34277f2edee76f475 [submodule.dune-xt-common] remote = git@github.com:dune-community/dune-xt-common.git status = 0fe2d7bb19a198ee8d099ff308b9208af0914eb4 .vcsetup (remotes/origin/HEAD) -commit = 20f5e1f0d88d3ca11c525bdc0daaf6b5efe4b102 +commit = bce0e2eb9b06a623fe09251712c27b864255b48c [submodule.dune-xt-data] remote = https://github.com/dune-community/dune-xt-data diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 5c522a76c873271971e49d5f0ab4aa27476c04e5..0000000000000000000000000000000000000000 --- a/.travis.yml +++ /dev/null @@ -1,88 +0,0 @@ -# ~~~ -# This file is part of the dune-xt-common project: -# https://github.com/dune-community/dune-xt-common -# Copyright 2009-2018 dune-xt-common developers and contributors. All rights reserved. -# License: Dual licensed as BSD 2-Clause License (http://opensource.org/licenses/BSD-2-Clause) -# or GPL-2.0+ (http://opensource.org/licenses/gpl-license) -# with "runtime exception" (http://www.dune-project.org/license.html) -# Authors: -# Felix Schindler (2015 - 2017) -# René Fritze (2015 - 2018) -# Tobias Leibner (2015 - 2016) -# ~~~ - -# THIS FILE IS AUTOGENERATED -- DO NOT EDIT # -# Re-run .ci/templates/update.py --nd instead # - -sudo: true -dist: trusty -language: generic -services: docker - -before_script: - - export MY_MODULE=dune-xt-common - - export BASEIMAGE="${MY_MODULE}-testing_${DOCKER_TAG}:${TRAVIS_BRANCH/\//_}" - - export IMAGE="dunecommunity/ci_${MY_MODULE}-testing_${DOCKER_TAG}:${TRAVIS_COMMIT}" - # get image with fallback to master branch of the super repo - - docker pull dunecommunity/${BASEIMAGE} || export BASEIMAGE="${MY_MODULE}-testing_${DOCKER_TAG}:master" ; docker pull dunecommunity/${BASEIMAGE} - - docker build --build-arg BASE=${BASEIMAGE} -t ${IMAGE} -f .ci/docker/Dockerfile . - - - export ENV_FILE=${HOME}/env - - python3 ./.travis.make_env_file.py - - docker inspect ${IMAGE} - - export DOCKER_RUN="docker run --env-file ${ENV_FILE} ${IMAGE}" - -script: - - ${DOCKER_RUN} /home/dune-ci/src/dune-xt-common/.travis.script.bash - -# runs independent of 'script' failure/success -after_script: - - ${DOCKER_RUN} /home/dune-ci/src/dune-xt-common/.travis.after_script.bash - # output for simpler replicability - - docker images ${IMAGE} - - echo ${DOCKER_RUN} - -after_failure: - - echo $DOCKER_PW | docker login --username="$DOCKER_USER" --password-stdin - - docker push ${IMAGE} - - echo "execute\n ${DOCKER_RUN} /home/dune-ci/src/dune-xt-common/.travis.script.bash\n to examine errors" - -notifications: - email: - on_success: change - on_failure: change - -branches: - except: - - gh-pages - -stages: - - Test C++ - - Test Python Bindings - -jobs: - include: - - stage: test_cpp - env: DOCKER_TAG=debian-unstable_gcc_full - - stage: test_cpp - env: DOCKER_TAG=debian_gcc_full - - stage: test_cpp - env: DOCKER_TAG=debian_clang_full - - stage: test_python - env: DOCKER_TAG=debian-unstable_gcc_full - script: ${DOCKER_RUN} /home/dune-ci/src/dune-xt-common/.travis.test_python.bash - # overwrite other global/matrix settings - after_script: true - - stage: test_python - env: DOCKER_TAG=debian_gcc_full - script: ${DOCKER_RUN} /home/dune-ci/src/dune-xt-common/.travis.test_python.bash - # overwrite other global/matrix settings - after_script: true - - stage: test_python - env: DOCKER_TAG=debian_clang_full - script: ${DOCKER_RUN} /home/dune-ci/src/dune-xt-common/.travis.test_python.bash - # overwrite other global/matrix settings - after_script: true - -# THIS FILE IS AUTOGENERATED -- DO NOT EDIT # -# Re-run .ci/templates/update.py --nd instead # \ No newline at end of file