-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/master' into multi-state
# Conflicts: # DESCRIPTION # man/dplyr_verbs.Rd # man/geom_hazard.Rd # man/geom_stepribbon.Rd # tests/testthat/test-as-ped.R
- Loading branch information
Showing
61 changed files
with
528 additions
and
773 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,3 +23,4 @@ | |
| ^pammtools\.Rproj$ | ||
| ^revdep$ | ||
| ^\.github$ | ||
| ^CRAN-SUBMISSION$ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,55 +1,48 @@ | ||
| # 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: | ||
| branches: | ||
| - main | ||
| - master | ||
| branches: [main, master] | ||
| pull_request: | ||
| branches: [main, master] | ||
| release: | ||
| types: [published] | ||
| workflow_dispatch: | ||
|
|
||
| name: pkgdown | ||
|
|
||
| jobs: | ||
| pkgdown: | ||
| runs-on: macOS-latest | ||
| runs-on: ubuntu-latest | ||
| # Only restrict concurrency for non-PR jobs | ||
| concurrency: | ||
| group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }} | ||
| env: | ||
| GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} | ||
| permissions: | ||
| contents: write | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - uses: actions/checkout@v3 | ||
|
|
||
| - uses: r-lib/actions/setup-r@v1 | ||
| - uses: r-lib/actions/setup-pandoc@v2 | ||
|
|
||
| - uses: r-lib/actions/setup-pandoc@v1 | ||
|
|
||
| - name: Query dependencies | ||
| run: | | ||
| install.packages('remotes') | ||
| saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2) | ||
| writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version") | ||
| shell: Rscript {0} | ||
| - uses: r-lib/actions/setup-r@v2 | ||
| with: | ||
| use-public-rspm: true | ||
|
|
||
| - name: Restore R package cache | ||
| uses: actions/cache@v2 | ||
| - uses: r-lib/actions/setup-r-dependencies@v2 | ||
| with: | ||
| path: ${{ env.R_LIBS_USER }} | ||
| key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }} | ||
| restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1- | ||
| extra-packages: any::pkgdown, local::. | ||
| needs: website | ||
|
|
||
| - name: Install dependencies | ||
| run: | | ||
| remotes::install_deps(dependencies = TRUE) | ||
| remotes::install_cran("pkgdown") | ||
| # Vignette dependencies | ||
| remotes::install_cran("TBFmultinomial") | ||
| remotes::install_cran("etm") | ||
| remotes::install_cran("scam") | ||
| remotes::install_cran("coxme") | ||
| remotes::install_cran("eha") | ||
| remotes::install_cran("timereg") | ||
| - name: Build site | ||
| run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE) | ||
| shell: Rscript {0} | ||
|
|
||
| - name: Install package | ||
| run: R CMD INSTALL . | ||
|
|
||
| - name: Deploy package | ||
| run: | | ||
| git config --local user.email "actions@github.com" | ||
| git config --local user.name "GitHub Actions" | ||
| Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE)' | ||
| - name: Deploy to GitHub pages 🚀 | ||
| if: github.event_name != 'pull_request' | ||
| uses: JamesIves/github-pages-deploy-action@v4.4.1 | ||
| with: | ||
| clean: false | ||
| branch: gh-pages | ||
| folder: docs |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,48 +1,50 @@ | ||
| # 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: | ||
| branches: | ||
| - main | ||
| - master | ||
| branches: [main, master] | ||
| pull_request: | ||
| branches: | ||
| - main | ||
| - master | ||
| branches: [main, master] | ||
|
|
||
| name: test-coverage | ||
|
|
||
| jobs: | ||
| test-coverage: | ||
| runs-on: macOS-latest | ||
| runs-on: ubuntu-latest | ||
| env: | ||
| GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - uses: actions/checkout@v3 | ||
|
|
||
| - uses: r-lib/actions/setup-r@v1 | ||
| - uses: r-lib/actions/setup-r@v2 | ||
| with: | ||
| use-public-rspm: true | ||
|
|
||
| - uses: r-lib/actions/setup-pandoc@v1 | ||
| - uses: r-lib/actions/setup-r-dependencies@v2 | ||
| with: | ||
| extra-packages: any::covr | ||
| needs: coverage | ||
|
|
||
| - name: Query dependencies | ||
| - name: Test coverage | ||
| run: | | ||
| install.packages('remotes') | ||
| saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2) | ||
| writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version") | ||
| covr::codecov( | ||
| quiet = FALSE, | ||
| clean = FALSE, | ||
| install_path = file.path(Sys.getenv("RUNNER_TEMP"), "package") | ||
| ) | ||
| shell: Rscript {0} | ||
|
|
||
| - name: Restore R package cache | ||
| uses: actions/cache@v2 | ||
| with: | ||
| path: ${{ env.R_LIBS_USER }} | ||
| key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }} | ||
| restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1- | ||
|
|
||
| - name: Install dependencies | ||
| - name: Show testthat output | ||
| if: always() | ||
| run: | | ||
| install.packages(c("remotes")) | ||
| remotes::install_deps(dependencies = TRUE) | ||
| remotes::install_cran("covr") | ||
| shell: Rscript {0} | ||
| ## -------------------------------------------------------------------- | ||
| find ${{ runner.temp }}/package -name 'testthat.Rout*' -exec cat '{}' \; || true | ||
| shell: bash | ||
|
|
||
| - name: Test coverage | ||
| run: covr::codecov(type = "all", line_exclusions = "R/zzz.R") | ||
| shell: Rscript {0} | ||
| - name: Upload test results | ||
| if: failure() | ||
| uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: coverage-test-failures | ||
| path: ${{ runner.temp }}/package |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.