Skip to content

Commit

Permalink
Merge pull request #37 from RichardHooijmaijers/final_cran_refine
Browse files Browse the repository at this point in the history
fix cran check and add rhub
  • Loading branch information
RichardHooijmaijers authored Oct 29, 2024
2 parents 77b2ab3 + 636db40 commit 503ad44
Show file tree
Hide file tree
Showing 6 changed files with 102 additions and 3 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@
^pkgdown$
^docs$
^cran-comments\.md$
^CRAN-SUBMISSION$
95 changes: 95 additions & 0 deletions .github/workflows/rhub.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
# R-hub's generic GitHub Actions workflow file. It's canonical location is at
# https://github.com/r-hub/actions/blob/v1/workflows/rhub.yaml
# You can update this file to a newer version using the rhub2 package:
#
# rhub::rhub_setup()
#
# It is unlikely that you need to modify this file manually.

name: R-hub
run-name: "${{ github.event.inputs.id }}: ${{ github.event.inputs.name || format('Manually run by {0}', github.triggering_actor) }}"

on:
workflow_dispatch:
inputs:
config:
description: 'A comma separated list of R-hub platforms to use.'
type: string
default: 'linux,windows,macos'
name:
description: 'Run name. You can leave this empty now.'
type: string
id:
description: 'Unique ID. You can leave this empty now.'
type: string

jobs:

setup:
runs-on: ubuntu-latest
outputs:
containers: ${{ steps.rhub-setup.outputs.containers }}
platforms: ${{ steps.rhub-setup.outputs.platforms }}

steps:
# NO NEED TO CHECKOUT HERE
- uses: r-hub/actions/setup@v1
with:
config: ${{ github.event.inputs.config }}
id: rhub-setup

linux-containers:
needs: setup
if: ${{ needs.setup.outputs.containers != '[]' }}
runs-on: ubuntu-latest
name: ${{ matrix.config.label }}
strategy:
fail-fast: false
matrix:
config: ${{ fromJson(needs.setup.outputs.containers) }}
container:
image: ${{ matrix.config.container }}

steps:
- uses: r-hub/actions/checkout@v1
- uses: r-hub/actions/platform-info@v1
with:
token: ${{ secrets.RHUB_TOKEN }}
job-config: ${{ matrix.config.job-config }}
- uses: r-hub/actions/setup-deps@v1
with:
token: ${{ secrets.RHUB_TOKEN }}
job-config: ${{ matrix.config.job-config }}
- uses: r-hub/actions/run-check@v1
with:
token: ${{ secrets.RHUB_TOKEN }}
job-config: ${{ matrix.config.job-config }}

other-platforms:
needs: setup
if: ${{ needs.setup.outputs.platforms != '[]' }}
runs-on: ${{ matrix.config.os }}
name: ${{ matrix.config.label }}
strategy:
fail-fast: false
matrix:
config: ${{ fromJson(needs.setup.outputs.platforms) }}

steps:
- uses: r-hub/actions/checkout@v1
- uses: r-hub/actions/setup-r@v1
with:
job-config: ${{ matrix.config.job-config }}
token: ${{ secrets.RHUB_TOKEN }}
- uses: r-hub/actions/platform-info@v1
with:
token: ${{ secrets.RHUB_TOKEN }}
job-config: ${{ matrix.config.job-config }}
- uses: r-hub/actions/setup-deps@v1
with:
job-config: ${{ matrix.config.job-config }}
token: ${{ secrets.RHUB_TOKEN }}
- uses: r-hub/actions/run-check@v1
with:
job-config: ${{ matrix.config.job-config }}
token: ${{ secrets.RHUB_TOKEN }}
3 changes: 3 additions & 0 deletions CRAN-SUBMISSION
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Version: 0.5.0
Date: 2024-10-29 15:15:36 UTC
SHA: 4fcde34ba6bc5dc02730a81e0665881569ef2304
2 changes: 1 addition & 1 deletion R/run_shinymixr.r
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#' @examples
#'
#' \dontrun{
#' run_shinymixr(".")
#' if (interactive()) run_shinymixr(".")
#' }
run_shinymixr <- function(wd = getwd(), ...){

Expand Down
2 changes: 1 addition & 1 deletion R/shinymixr_gadget.R
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#' @examples
#'
#' \dontrun{
#' shinymixr_gadget()
#' if (interactive()) shinymixr_gadget()
#' }
shinymixr_gadget <- function(){
if(!"shinymixr" %in% tolower((.packages()))){
Expand Down
2 changes: 1 addition & 1 deletion R/tree_overview.r
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#' @examples
#'
#' \dontrun{
#' tree_overview(proj_obj)
#' if (interactive()) tree_overview(proj_obj)
#' }
tree_overview <- function(proj_obj, ...){
tmod <- overview(proj_obj, ...)
Expand Down

0 comments on commit 503ad44

Please sign in to comment.