Skip to content

Commit

Permalink
Merge pull request #1 from panukatan/dev
Browse files Browse the repository at this point in the history
refresh repository
  • Loading branch information
ernestguevarra authored Mar 22, 2024
2 parents 837ed0e + 49550f5 commit 870646f
Show file tree
Hide file tree
Showing 9 changed files with 46 additions and 34 deletions.
30 changes: 11 additions & 19 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
Expand All @@ -18,7 +18,7 @@ jobs:
fail-fast: false
matrix:
config:
- {os: macOS-latest, r: 'release'}
- {os: macos-latest, r: 'release'}
- {os: windows-latest, r: 'release'}
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, r: 'release'}
Expand All @@ -29,30 +29,22 @@ jobs:
R_KEEP_PKG_SOURCE: yes

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-pandoc@v1
- uses: r-lib/actions/setup-pandoc@v2

- uses: r-lib/actions/setup-r@v1
- uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ matrix.config.r }}
http-user-agent: ${{ matrix.config.http-user-agent }}
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v1
- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: rcmdcheck
extra-packages: any::rcmdcheck
needs: check

- uses: r-lib/actions/check-r-package@v1

- name: Show testthat output
if: always()
run: find check -name 'testthat.Rout*' -exec cat '{}' \; || true
shell: bash

- name: Upload check results
if: failure()
uses: actions/upload-artifact@main
- uses: r-lib/actions/check-r-package@v2
with:
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
path: check
upload-snapshots: true
build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'
32 changes: 26 additions & 6 deletions .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Workflow derived from https://github.com/r-lib/actions/tree/master/examples
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
Expand All @@ -15,16 +15,36 @@ jobs:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-r@v1
- uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v1
- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: covr
extra-packages: any::covr
needs: coverage

- name: Test coverage
run: covr::codecov()
run: |
covr::codecov(
quiet = FALSE,
clean = FALSE,
install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
)
shell: Rscript {0}

- name: Show testthat output
if: always()
run: |
## --------------------------------------------------------------------
find '${{ runner.temp }}/package' -name 'testthat.Rout*' -exec cat '{}' \; || true
shell: bash

- name: Upload test results
if: failure()
uses: actions/upload-artifact@v4
with:
name: coverage-test-failures
path: ${{ runner.temp }}/package
5 changes: 3 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,14 @@ License: GPL (>= 3)
Imports:
googledrive,
googlesheets4,
readxl
readxl,
stringi
Suggests:
spelling
Encoding: UTF-8
Language: en-GB
LazyData: true
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.1.2
RoxygenNote: 7.3.1
URL: https://panukatan.io/openmarawi/, https://github.com/panukatan/openmarawi
BugReports: https://github.com/panukatan/openmarawi/issues
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ importFrom(googledrive,drive_ls)
importFrom(googlesheets4,gs4_deauth)
importFrom(googlesheets4,read_sheet)
importFrom(readxl,read_xls)
importFrom(stringi,stri_detect)
1 change: 1 addition & 0 deletions R/openmarawi.R
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#' @importFrom googledrive drive_deauth drive_ls drive_get
#' @importFrom googlesheets4 gs4_deauth read_sheet
#' @importFrom readxl read_xls
#' @importFrom stringi stri_detect
#'
#
################################################################################
Expand Down
2 changes: 1 addition & 1 deletion README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ knitr::opts_chunk$set(
<!-- badges: start -->
[![Project Status: WIP – Initial development is in progress, but there has not yet been a stable, usable release suitable for the public.](https://www.repostatus.org/badges/latest/wip.svg)](https://www.repostatus.org/#wip)
[![Lifecycle: experimental](https://img.shields.io/badge/lifecycle-experimental-orange.svg)](https://lifecycle.r-lib.org/articles/stages.html#experimental)
[![R-CMD-check](https://github.com/panukatan/openmarawi/workflows/R-CMD-check/badge.svg)](https://github.com/panukatan/openmarawi/actions)
[![R-CMD-check](https://github.com/panukatan/openmarawi/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/panukatan/openmarawi/actions/workflows/R-CMD-check.yaml)
[![test-coverage](https://github.com/panukatan/openmarawi/actions/workflows/test-coverage.yaml/badge.svg)](https://github.com/panukatan/openmarawi/actions/workflows/test-coverage.yaml)
[![CodeFactor](https://www.codefactor.io/repository/github/panukatan/openmarawi/badge)](https://www.codefactor.io/repository/github/panukatan/openmarawi)
<!-- badges: end -->
Expand Down
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ has not yet been a stable, usable release suitable for the
public.](https://www.repostatus.org/badges/latest/wip.svg)](https://www.repostatus.org/#wip)
[![Lifecycle:
experimental](https://img.shields.io/badge/lifecycle-experimental-orange.svg)](https://lifecycle.r-lib.org/articles/stages.html#experimental)
[![R-CMD-check](https://github.com/panukatan/openmarawi/workflows/R-CMD-check/badge.svg)](https://github.com/panukatan/openmarawi/actions)
[![R-CMD-check](https://github.com/panukatan/openmarawi/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/panukatan/openmarawi/actions/workflows/R-CMD-check.yaml)
[![test-coverage](https://github.com/panukatan/openmarawi/actions/workflows/test-coverage.yaml/badge.svg)](https://github.com/panukatan/openmarawi/actions/workflows/test-coverage.yaml)
[![CodeFactor](https://www.codefactor.io/repository/github/panukatan/openmarawi/badge)](https://www.codefactor.io/repository/github/panukatan/openmarawi)
<!-- badges: end -->
Expand All @@ -30,8 +30,7 @@ of Marawi City.

<!---
You can install the released version of openmarawi from [CRAN](https://CRAN.R-project.org) with:
``` r
&#10;``` r
install.packages("openmarawi")
```
--->
Expand Down
2 changes: 0 additions & 2 deletions man/marawi_get.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/openmarawi.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 870646f

Please sign in to comment.