[arrow] branch master updated: ARROW-5496: [R][CI] Fix relative paths in R codecov.io reporting

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

romainfrancois pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git


The following commit(s) were added to refs/heads/master by this push:
     new 714ef66  ARROW-5496: [R][CI] Fix relative paths in R codecov.io reporting
714ef66 is described below

commit 714ef667680b15124657ea2fc5c7a4d3c9593ffd
Author: Neal Richardson <ne...@gmail.com>
AuthorDate: Wed Jun 5 11:02:11 2019 +0200

    ARROW-5496: [R][CI] Fix relative paths in R codecov.io reporting
    
    https://issues.apache.org/jira/browse/ARROW-5418 added coverage stats for R, but due to an assumption in the coverage runner that the project would be at the top level of the GitHub repository, the `r/` subdirectory was not included, so R coverage stats were put in the wrong place, and detail files (such as https://codecov.io/gh/apache/arrow/src/master/R/ArrayData.R) return 404.
    
    This works around the issue (a proper fix belongs in the `covr` package, but I'll leave that for another time). You can see [here](https://codecov.io/gh/nealrichardson/arrow/tree/8ce221555a07ecff0fc173816df1ed7d946c38d7/r) that the R files are grouped appropriately in the `r/` subdir, and links to file details work: https://codecov.io/gh/nealrichardson/arrow/src/8ce221555a07ecff0fc173816df1ed7d946c38d7/r/R/ArrayData.R
    
    Author: Neal Richardson <ne...@gmail.com>
    
    Closes #4464 from nealrichardson/r-codecov-paths and squashes the following commits:
    
    abdf6515 <Neal Richardson> Boilerplate
    8ce22155 <Neal Richardson> Prepend the r/ subdir path to the codecov report
---
 .travis.yml                   |  2 +-
 ci/travis_upload_r_coverage.R | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8cd6c91..ab29ec8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -360,7 +360,7 @@ matrix:
     - export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$TRAVIS_BUILD_DIR/cpp-install/lib/pkgconfig
     - pushd ${TRAVIS_BUILD_DIR}/r
     after_success:
-    - Rscript -e 'covr::codecov()'
+    - Rscript ../ci/travis_upload_r_coverage.R
 
 
 after_failure:
diff --git a/ci/travis_upload_r_coverage.R b/ci/travis_upload_r_coverage.R
new file mode 100644
index 0000000..89c102f
--- /dev/null
+++ b/ci/travis_upload_r_coverage.R
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+library(covr)
+# Hack file paths to include the subdirectory
+trace("to_codecov", quote(per_line <- function(x) {
+   out <- covr:::per_line(x)
+   setNames(out, paste0("r/", names(out)))
+ }), where = package_coverage)
+codecov()