diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 4f9f6e5..e1ac914 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -11,6 +11,7 @@ name: R-CMD-check jobs: R-CMD-check: + if: "!contains(github.event.head_commit.message, 'skip check')" runs-on: ${{ matrix.config.os }} name: ${{ matrix.config.os }} (${{ matrix.config.r }}) diff --git a/.github/workflows/ep-update-data.yaml b/.github/workflows/ep-update-data.yaml index 92df391..902ea81 100644 --- a/.github/workflows/ep-update-data.yaml +++ b/.github/workflows/ep-update-data.yaml @@ -10,7 +10,7 @@ on: name: ep-update-data jobs: - pkgdown: + ep-update-data: runs-on: ubuntu-latest env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} @@ -25,10 +25,9 @@ jobs: - uses: r-lib/actions/setup-r-dependencies@v1 with: - extra-packages: piggyback, arrow + extra-packages: piggyback, arrow, readr - name: Run data update - with: - GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} run: | Rscript -e 'source("update/ep_update.R")' + shell: bash diff --git a/.github/workflows/pkgdown-pak.yaml b/.github/workflows/pkgdown-pak.yaml index 4857c7b..9e376fb 100644 --- a/.github/workflows/pkgdown-pak.yaml +++ b/.github/workflows/pkgdown-pak.yaml @@ -10,6 +10,7 @@ name: pkgdown jobs: pkgdown: + if: "!contains(github.event.head_commit.message, 'skip pkgdown')" runs-on: ubuntu-latest env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml index 2c71b41..f0b31bc 100644 --- a/.github/workflows/test-coverage.yaml +++ b/.github/workflows/test-coverage.yaml @@ -10,6 +10,7 @@ name: testcoverage jobs: testcoverage: + if: "!contains(github.event.head_commit.message, 'skip covr')" runs-on: ubuntu-latest env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} diff --git a/DESCRIPTION b/DESCRIPTION index 1628342..57471b1 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -2,7 +2,7 @@ Package: ffopportunity Title: Models for Fantasy Football Expected Points Version: 0.1.0.04 Authors@R: c( - person("Joe", "Sydlowski", , "syd235@gmail.com", role = c("aut", "cre")), + person("Joe", "Sydlowski", , "syd235@gmail.com", role = c("aut", "cre", "cph")), person("Tan", "Ho", , "tan@tanho.ca", role = "aut", comment = c(ORCID = "0000-0001-8388-5155")) ) diff --git a/update/ep_update.R b/update/ep_update.R index f3907d2..95eb567 100644 --- a/update/ep_update.R +++ b/update/ep_update.R @@ -2,7 +2,7 @@ pkgload::load_all() save_ep_data <- function(season, folder_path, version){ - ep_object <- ffexpectedpoints::ep_build(season) + ep_object <- ffexpectedpoints::ep_build(season,version = version) # rds saveRDS(ep_object$ep_weekly, file.path(folder_path, glue::glue('ep_weekly_{season}.rds'))) @@ -40,4 +40,5 @@ update_ep <- function(season, version = "v1.0.0"){ invisible(NULL) } -update_ep(nflreadr:::most_recent_season()) +update_ep(nflreadr:::most_recent_season(), version = "latest") +update_ep(nflreadr:::most_recent_season(), version = "v1.0.0")