summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2018-10-16 12:33:23 +0100
committerGitHub <noreply@github.com>2018-10-16 12:33:23 +0100
commitd3c4960c71829c2c6694297a92e688a1ae5e16e4 (patch)
tree474759a1c7096eba81b89a36f8fb60b9e2ac8333
parentc47156cb81dd8b3a9b04967da91310740cdf211f (diff)
parentf866b85dd2b5b087b3edfe99cda576f9ef8179b4 (diff)
downloadrspamd-d3c4960c71829c2c6694297a92e688a1ae5e16e4.tar.gz
rspamd-d3c4960c71829c2c6694297a92e688a1ae5e16e4.zip
Merge pull request #2595 from citrin/coveralls
Add git repo info to coveralls payload
-rwxr-xr-xtest/functional/util/merge_coveralls.py14
1 files changed, 14 insertions, 0 deletions
diff --git a/test/functional/util/merge_coveralls.py b/test/functional/util/merge_coveralls.py
index b19aa383b..c3976b48f 100755
--- a/test/functional/util/merge_coveralls.py
+++ b/test/functional/util/merge_coveralls.py
@@ -141,6 +141,20 @@ if __name__ == '__main__':
j1['commit_sha'] = os.getenv('CI_COMMIT_SHA')
if os.getenv('CI_BUILD_EVENT') == 'pull_request':
j1['service_pull_request'] = os.getenv('CI_PULL_REQUEST')
+ # git data can be filled by cpp-coveralls, but in our layout it can't find repo
+ # so we can override git info witout merging
+ j1['git'] = {
+ 'head': {
+ 'id': j1['commit_sha'],
+ 'author_email': os.getenv('CI_COMMIT_AUTHOR_EMAIL'),
+ 'message': os.getenv('CI_COMMIT_MESSAGE')
+ },
+ 'branch': j1['service_branch'],
+ 'remotes': [{
+ 'name': 'origin',
+ 'url': os.getenv('CI_REPO_REMOTE')
+ }]
+ }
j1['source_files'] = list(files.values())