From 08242248ae7d1e79018fc2e91e85bccdd453107a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Fritze?= <rene.fritze@wwu.de>
Date: Thu, 6 Dec 2018 09:13:26 +0100
Subject: [PATCH] [ci] avoid failing in forked PRs
---
.gitsuper | 42 ++++++++++++++++++++--------------------
.travis.script.bash | 4 ++--
.travis.test_python.bash | 9 +++++++--
3 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/.gitsuper b/.gitsuper
index 87c78f2a7..435ca7f36 100644
--- a/.gitsuper
+++ b/.gitsuper
@@ -10,15 +10,15 @@ status = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8 bin (heads/master)
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)
+ 58bd932e2311a288e0163d041f836b50f19111cb dune-testtools (remotes/origin/testname_listing_hack2.6)
+ 07f9700459c616186737a9a34277f2edee76f475 dune-uggrid (v2.6.0-1-g07f97004)
+ +b5363f959a9ee7a8e80b245efead8f33ec492e53 dune-xt-common (heads/avoid_forked_pr_fail)
+ +ba97dd5c3757f1a644364e0c67ef7e9bafa1288e dune-xt-data (heads/avoid_forked_pr_fail)
+ b25ce1ba4290fc3ff325b807453765cd9d4688ac dune-xt-functions (heads/compatible_with_2.6)
+ +78332bb0abb50299a732a080ebaa1d9e840eabb2 dune-xt-grid (heads/avoid_forked_pr_fail)
+cc17fb82512342e75bc48bde751249cc8dd015e4 dune-xt-la (heads/avoid_forked_pr_fail)
- 09d0378f616b94d68bcdd9fc6114813181849ec0 scripts (remotes/origin/HEAD)
-commit = f983be2da4c9bcbc92b8b507549118155015367d
+ 09d0378f616b94d68bcdd9fc6114813181849ec0 scripts (heads/master)
+commit = 0318dd89aa1301a15fcdacf7507f067ee0377ae3
[submodule.bin]
remote = git@github.com:dune-community/local-bin.git
@@ -67,42 +67,42 @@ commit = 5a1f77d7a0a41c2d065b29f00dda0871ec70337b
[submodule.dune-pybindxi]
remote = git@github.com:dune-community/dune-pybindxi.git
-status = a18500d497d2ffa2f627bc6e7da0aa1169b81ea3 .vcsetup (a18500d)
+status = a18500d497d2ffa2f627bc6e7da0aa1169b81ea3 .vcsetup (heads/master)
commit = e66c44d6b31fe0994ffb7705cd00e1f853289724
[submodule.dune-testtools]
-remote = https://github.com/dune-mirrors/dune-testtools.git
+remote = https://github.com/dune-community/dune-testtools
status =
-commit = 26cc8cb4161a3a51002ab2a81b8c81d2c951ee79
+commit = 58bd932e2311a288e0163d041f836b50f19111cb
[submodule.dune-uggrid]
remote = https://github.com/dune-mirrors/dune-uggrid.git
status =
-commit = 8fe883e99c58c9f0c2f92457d546a0ac9f5a9bf9
+commit = 07f9700459c616186737a9a34277f2edee76f475
[submodule.dune-xt-common]
remote = git@github.com:dune-community/dune-xt-common.git
-status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (heads/master)
-commit = 16fe1e8004d79994ee3b66a587b9b4997e22bfe7
+status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (remotes/origin/HEAD)
+commit = b5363f959a9ee7a8e80b245efead8f33ec492e53
[submodule.dune-xt-data]
remote = https://github.com/dune-community/dune-xt-data
-status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (heads/master)
-commit = 6f0c1a3d04967299950048988ab915347c307271
+status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (remotes/origin/HEAD)
+commit = ba97dd5c3757f1a644364e0c67ef7e9bafa1288e
[submodule.dune-xt-functions]
remote = git@github.com:dune-community/dune-xt-functions.git
-status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (heads/master)
-commit = 3fec1858d0f902a8ba2d309d8a941699fbd5c1e0
+status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (remotes/origin/HEAD)
+commit = b25ce1ba4290fc3ff325b807453765cd9d4688ac
[submodule.dune-xt-grid]
remote = git@github.com:dune-community/dune-xt-grid.git
-status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (heads/master)
-commit = 294e69697971e4ed140e2c5eb58bf0208007fbfc
+status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (remotes/origin/HEAD)
+commit = 78332bb0abb50299a732a080ebaa1d9e840eabb2
[submodule.dune-xt-la]
remote = git@github.com:dune-community/dune-xt-la.git
-status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (heads/master)
+status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (remotes/origin/HEAD)
commit = cc17fb82512342e75bc48bde751249cc8dd015e4
[submodule.scripts]
diff --git a/.travis.script.bash b/.travis.script.bash
index a1367899c..c2cfa8d02 100755
--- a/.travis.script.bash
+++ b/.travis.script.bash
@@ -47,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}/dune-env pip install codecov
-${OLDPWD}/dune-env codecov -v -X gcov -X coveragepy -F ctest -f ${COVERAGE_INFO} -t ${CODECOV_TOKEN}
+${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}
popd
# ****** 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 93c8e211d..e53a00363 100755
--- a/.travis.test_python.bash
+++ b/.travis.test_python.bash
@@ -14,8 +14,13 @@ ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD}
${WAIT} ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD} bindings
${WAIT} ${SRC_DCTRL} ${BLD} --only=${MY_MODULE} bexec ${BUILD_CMD} test_python
+if [ "${TRAVIS_SECURE_ENV_VARS}" == "false" ] ; then
+ echo "Coverage reporting disabled for forked repo/PR"
+ exit 0
+fi
+
cd ${SUPERDIR}/${MY_MODULE}
-${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}
+${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}
# ****** THIS FILE IS AUTOGENERATED, DO NOT EDIT **********
\ No newline at end of file
--
GitLab