Skip to content

Commit

Permalink
ARROW-5496: [R][CI] Fix relative paths in R codecov.io reporting
Browse files Browse the repository at this point in the history
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 <neal.p.richardson@gmail.com>

Closes #4464 from nealrichardson/r-codecov-paths and squashes the following commits:

abdf651 <Neal Richardson> Boilerplate
8ce2215 <Neal Richardson> Prepend the r/ subdir path to the codecov report
  • Loading branch information
nealrichardson authored and romainfrancois committed Jun 5, 2019
1 parent a4dad32 commit 714ef66
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -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:
Expand Down
26 changes: 26 additions & 0 deletions 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()

0 comments on commit 714ef66

Please sign in to comment.