From 92cc6eb472099d8ea605d7d80e2badd464fb8312 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Milk?= <rene.milk@wwu.de>
Date: Wed, 5 Dec 2018 19:21:59 +0100
Subject: [PATCH] [ci] avoid failing on forked PRs
---
.gitsuper | 90 +++++++++++++++++----------------------
.travis.after_script.bash | 12 ------
.travis.make_env_file.py | 11 -----
.travis.script.bash | 25 ++++-------
.travis.test_python.bash | 17 ++------
.travis.yml | 6 +--
6 files changed, 53 insertions(+), 108 deletions(-)
diff --git a/.gitsuper b/.gitsuper
index a94b79b72..23885f903 100644
--- a/.gitsuper
+++ b/.gitsuper
@@ -1,26 +1,24 @@
[supermodule]
-remote = git@github.com:dune-community/dune-gdt-super.git
+remote = git@github.com:dune-community/dune-xt-super.git
status = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8 bin (heads/master)
- 28c9ce81c14c878a71e907ab05b9bb72df77883e config.opts (heads/master)
- 8f2c5aba441417bf2c42f22272f538c68a89cc4a dune-alugrid (remotes/origin/releases/2.5)
- 707acf201d5a754c80f87cc4d71aa36bf29a6e3f dune-common (v2.5.1-9-g707acf20)
- +100be59afd86dfc8823e126ed8f9064d738d70d6 dune-gdt (heads/entropy_flux_even_newer)
- 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)
- 63df56a54f81eda308233a683eb329e77e69f0a9 dune-istl (v2.5.1rc1)
- 0d757d65e5d57134a7ecf304e35d063f4ccc7116 dune-localfunctions (v2.5.1rc1)
- 8a69fc68165780921bbba77da338b6932daf983c dune-pybindxi (v2.2.1-16-g8a69fc6)
- 741e4f8e53bdd3e1b6e19d84eb22b6e3dc48526c dune-python (remotes/origin/releases/2.5)
- 26cc8cb4161a3a51002ab2a81b8c81d2c951ee79 dune-testtools (remotes/origin/p/renemilk/testname_listing_hack_no-skiptest)
- 0a74e7dd0b2115778a5d490dab08a2ed07fcaa1e dune-uggrid (v2.5.2)
- 5041a24932b5d375bc3f304c2e7b371cf8b9f3db dune-xt-common (heads/momentmodels)
- 27c4d5cffc78147488d9fca2c0a286130e270ede dune-xt-data (heads/momentmodels)
- c23606375be3f99c90b21577eec7c1fd2ce0c99e dune-xt-functions (heads/momentmodels)
- 93e7123392178bb4ec4bd698c427238a9b709a7c dune-xt-grid (heads/momentmodels)
- +2cb9e5158e85cc2a42255e1293e71029b70938f4 dune-xt-la (heads/dailywork_tleibner)
- 09d0378f616b94d68bcdd9fc6114813181849ec0 scripts (heads/master)
-commit = 217c19a46d7289f7fbd84bf1174f8caf43d6ea31
+ 28c9ce81c14c878a71e907ab05b9bb72df77883e config.opts (remotes/origin/HEAD)
+ f308c6637edd65dcb83c4c1a46feaf05b958130e dune-alugrid (v2.6.0-7-gf308c663)
+ 76d7f0c9886a061571cb8dc66dd45a4ef86e7a58 dune-common (v2.2.1-2269-g76d7f0c9)
+ c4e11445c1aa0f61b4a83f2e61c93ece231085f2 dune-geometry (v2.2.0-839-gc4e1144)
+ af5766f0df47e3d0b62ea486efb9cdbf8e1cfc52 dune-grid (v2.2.0-2671-gaf5766f0d)
+ 1369ae9329d0928480d6b18ed772fc77e1abf752 dune-grid-glue (v2.4.0-161-g1369ae9)
+ ef68ae0ec40f9d369e4ea9b31e560af6af545bf6 dune-istl (v2.6.0-4-gef68ae0e)
+ 5a1f77d7a0a41c2d065b29f00dda0871ec70337b dune-localfunctions (v2.6.0-2-g5a1f77d)
+ e66c44d6b31fe0994ffb7705cd00e1f853289724 dune-pybindxi (v2.2.1-23-ge66c44d)
+ +26cc8cb4161a3a51002ab2a81b8c81d2c951ee79 dune-testtools (26cc8cb)
+ +8fe883e99c58c9f0c2f92457d546a0ac9f5a9bf9 dune-uggrid (v2.5.2-1-g8fe883e9)
+ +16fe1e8004d79994ee3b66a587b9b4997e22bfe7 dune-xt-common (heads/avoid_forked_pr_fail)
+ +6f0c1a3d04967299950048988ab915347c307271 dune-xt-data (heads/avoid_forked_pr_fail)
+ +3fec1858d0f902a8ba2d309d8a941699fbd5c1e0 dune-xt-functions (heads/avoid_forked_pr_fail)
+ +294e69697971e4ed140e2c5eb58bf0208007fbfc dune-xt-grid (heads/avoid_forked_pr_fail)
+ +be855f2b3ae240a5332c39335e8055d1441a2259 dune-xt-la (heads/avoid_forked_pr_fail)
+ 09d0378f616b94d68bcdd9fc6114813181849ec0 scripts (remotes/origin/HEAD)
+commit = f983be2da4c9bcbc92b8b507549118155015367d
[submodule.bin]
remote = git@github.com:dune-community/local-bin.git
@@ -35,52 +33,42 @@ commit = 28c9ce81c14c878a71e907ab05b9bb72df77883e
[submodule.dune-alugrid]
remote = https://github.com/dune-mirrors/dune-alugrid.git
status =
-commit = 8f2c5aba441417bf2c42f22272f538c68a89cc4a
+commit = f308c6637edd65dcb83c4c1a46feaf05b958130e
[submodule.dune-common]
remote = git@github.com:dune-community/dune-common.git
status =
-commit = 707acf201d5a754c80f87cc4d71aa36bf29a6e3f
-
-[submodule.dune-gdt]
-remote = git@github.com:dune-community/dune-gdt.git
-status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (heads/master)
-commit = 100be59afd86dfc8823e126ed8f9064d738d70d6
+commit = 76d7f0c9886a061571cb8dc66dd45a4ef86e7a58
[submodule.dune-geometry]
-remote = git@github.com:dune-community/dune-geometry.git
+remote = http://github.com/dune-community/dune-geometry.git
status =
-commit = 390a2c503783bbed778a8ff610f8c5ca09c238d0
+commit = c4e11445c1aa0f61b4a83f2e61c93ece231085f2
[submodule.dune-grid]
-remote = git@github.com:dune-community/dune-grid.git
+remote = http://github.com/dune-community/dune-grid.git
status =
-commit = d7b20bbc5f6fdcfc312beb0ea5d16d39ea26904e
+commit = af5766f0df47e3d0b62ea486efb9cdbf8e1cfc52
[submodule.dune-grid-glue]
remote = https://github.com/dune-mirrors/dune-grid-glue.git
status =
-commit = 9e29a333e8af02382d80b95335a784d5ce1ea2c8
+commit = 1369ae9329d0928480d6b18ed772fc77e1abf752
[submodule.dune-istl]
-remote = https://github.com/dune-mirrors/dune-istl.git
+remote = http://github.com/dune-mirrors/dune-istl.git
status =
-commit = 63df56a54f81eda308233a683eb329e77e69f0a9
+commit = ef68ae0ec40f9d369e4ea9b31e560af6af545bf6
[submodule.dune-localfunctions]
-remote = https://github.com/dune-mirrors/dune-localfunctions.git
+remote = http://github.com/dune-mirrors/dune-localfunctions.git
status =
-commit = 0d757d65e5d57134a7ecf304e35d063f4ccc7116
+commit = 5a1f77d7a0a41c2d065b29f00dda0871ec70337b
[submodule.dune-pybindxi]
remote = git@github.com:dune-community/dune-pybindxi.git
status = a18500d497d2ffa2f627bc6e7da0aa1169b81ea3 .vcsetup (a18500d)
-commit = 8a69fc68165780921bbba77da338b6932daf983c
-
-[submodule.dune-python]
-remote = https://github.com/dune-mirrors/dune-python.git
-status =
-commit = 741e4f8e53bdd3e1b6e19d84eb22b6e3dc48526c
+commit = e66c44d6b31fe0994ffb7705cd00e1f853289724
[submodule.dune-testtools]
remote = https://github.com/dune-mirrors/dune-testtools.git
@@ -90,35 +78,35 @@ commit = 26cc8cb4161a3a51002ab2a81b8c81d2c951ee79
[submodule.dune-uggrid]
remote = https://github.com/dune-mirrors/dune-uggrid.git
status =
-commit = 0a74e7dd0b2115778a5d490dab08a2ed07fcaa1e
+commit = 8fe883e99c58c9f0c2f92457d546a0ac9f5a9bf9
[submodule.dune-xt-common]
remote = git@github.com:dune-community/dune-xt-common.git
status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (heads/master)
-commit = 5041a24932b5d375bc3f304c2e7b371cf8b9f3db
+commit = 16fe1e8004d79994ee3b66a587b9b4997e22bfe7
[submodule.dune-xt-data]
-remote = git@github.com:dune-community/dune-xt-data
+remote = https://github.com/dune-community/dune-xt-data
status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (heads/master)
-commit = 27c4d5cffc78147488d9fca2c0a286130e270ede
+commit = 6f0c1a3d04967299950048988ab915347c307271
[submodule.dune-xt-functions]
remote = git@github.com:dune-community/dune-xt-functions.git
status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (heads/master)
-commit = c23606375be3f99c90b21577eec7c1fd2ce0c99e
+commit = 3fec1858d0f902a8ba2d309d8a941699fbd5c1e0
[submodule.dune-xt-grid]
remote = git@github.com:dune-community/dune-xt-grid.git
status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (heads/master)
-commit = 93e7123392178bb4ec4bd698c427238a9b709a7c
+commit = 294e69697971e4ed140e2c5eb58bf0208007fbfc
[submodule.dune-xt-la]
remote = git@github.com:dune-community/dune-xt-la.git
status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (heads/master)
-commit = 2cb9e5158e85cc2a42255e1293e71029b70938f4
+commit = be855f2b3ae240a5332c39335e8055d1441a2259
[submodule.scripts]
remote = https://github.com/wwu-numerik/scripts.git
-status = fb5ebc10e647d637c69497af2ec2560847eb2112 python/pylicense (v0.2.0~10)
+status = fb5ebc10e647d637c69497af2ec2560847eb2112 python/pylicense (fb5ebc1)
commit = 09d0378f616b94d68bcdd9fc6114813181849ec0
diff --git a/.travis.after_script.bash b/.travis.after_script.bash
index 42c3c618e..4983df1eb 100755
--- a/.travis.after_script.bash
+++ b/.travis.after_script.bash
@@ -1,16 +1,4 @@
#!/bin/bash
-#
-# ~~~
-# This file is part of the dune-xt-la project:
-# https://github.com/dune-community/dune-xt-la
-# Copyright 2009-2018 dune-xt-la 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 (2017)
-# René Fritze (2017 - 2018)
-# ~~~
# ****** THIS FILE IS AUTOGENERATED, DO NOT EDIT **********
# this file is treated as a jinja2 template
diff --git a/.travis.make_env_file.py b/.travis.make_env_file.py
index caf3c7632..e77c12091 100644
--- a/.travis.make_env_file.py
+++ b/.travis.make_env_file.py
@@ -1,15 +1,4 @@
#!/usr/bin/env python3
-#
-# ~~~
-# This file is part of the dune-xt-la project:
-# https://github.com/dune-community/dune-xt-la
-# Copyright 2009-2018 dune-xt-la 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:
-# René Fritze (2017 - 2018)
-# ~~~
import os
from os.path import expanduser
diff --git a/.travis.script.bash b/.travis.script.bash
index 0802d8e0b..a1367899c 100755
--- a/.travis.script.bash
+++ b/.travis.script.bash
@@ -1,17 +1,4 @@
#!/bin/bash
-#
-# ~~~
-# This file is part of the dune-xt-la project:
-# https://github.com/dune-community/dune-xt-la
-# Copyright 2009-2018 dune-xt-la 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 (2017)
-# René Fritze (2017 - 2018)
-# Tobias Leibner (2018)
-# ~~~
# ****** THIS FILE IS AUTOGENERATED, DO NOT EDIT **********
# this file is treated as a jinja2 template
@@ -43,6 +30,12 @@ fi
# clang coverage currently disabled for being to mem hungry
if [[ ${CC} == *"clang"* ]] ; then
+ echo "Coverage reporting disabled with Clang"
+ exit 0
+fi
+
+if [ "${TRAVIS_SECURE_ENV_VARS}" == "false" ] ; then
+ echo "Coverage reporting disabled for forked repo/PR"
exit 0
fi
@@ -54,8 +47,8 @@ for d in "dune-common" "dune-pybindxi" "dune-geometry" "dune-istl" "dune-grid"
done
lcov --directory . --output-file ${COVERAGE_INFO} -r ${COVERAGE_INFO} "${SUPERDIR}/${MY_MODULE}/dune/xt/*/test/*"
cd ${SUPERDIR}/${MY_MODULE}
-${OLDPWD}/run-in-dune-env pip install codecov
-${OLDPWD}/run-in-dune-env codecov -v -X gcov -X coveragepy -F ctest -f ${COVERAGE_INFO} -t ${CODECOV_TOKEN}
+${OLDPWD}/dune-env pip install codecov
+${OLDPWD}/dune-env codecov -v -X gcov -X coveragepy -F ctest -f ${COVERAGE_INFO} -t ${CODECOV_TOKEN}
popd
-# ****** THIS FILE IS AUTOGENERATED, DO NOT EDIT **********
+# ****** THIS FILE IS AUTOGENERATED, DO NOT EDIT **********
\ No newline at end of file
diff --git a/.travis.test_python.bash b/.travis.test_python.bash
index 521392a4e..93c8e211d 100755
--- a/.travis.test_python.bash
+++ b/.travis.test_python.bash
@@ -1,15 +1,4 @@
#!/bin/bash
-#
-# ~~~
-# This file is part of the dune-xt-la project:
-# https://github.com/dune-community/dune-xt-la
-# Copyright 2009-2018 dune-xt-la 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:
-# René Fritze (2018)
-# ~~~
# ****** THIS FILE IS AUTOGENERATED, DO NOT EDIT **********
# this file is treated as a jinja2 template
@@ -26,7 +15,7 @@ ${WAIT} ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD} bindings
${WAIT} ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD} test_python
cd ${SUPERDIR}/${MY_MODULE}
-${DUNE_BUILD_DIR}/${MY_MODULE}/run-in-dune-env pip install codecov
-${DUNE_BUILD_DIR}/${MY_MODULE}/run-in-dune-env codecov -X gcov -F pytest -t ${CODECOV_TOKEN}
+${DUNE_BUILD_DIR}/${MY_MODULE}/dune-env pip install codecov
+${DUNE_BUILD_DIR}/${MY_MODULE}/dune-env codecov -X gcov -F pytest -t ${CODECOV_TOKEN}
-# ****** THIS FILE IS AUTOGENERATED, DO NOT EDIT **********
+# ****** THIS FILE IS AUTOGENERATED, DO NOT EDIT **********
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index e6e187529..372e16f9a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,13 @@
-# ~~~
# This file is part of the dune-xt-la project:
# https://github.com/dune-community/dune-xt-la
-# Copyright 2009-2018 dune-xt-la developers and contributors. All rights reserved.
+# Copyright 2009-2017 dune-xt-functions 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 (2016 - 2017)
-# René Fritze (2016 - 2018)
+# Rene Milk (2016 - 2017)
# Tobias Leibner (2016)
-# ~~~
# THIS FILE IS AUTOGENERATED -- DO NOT EDIT #
# Re-run .ci/templates/update.py --nd instead #
--
GitLab