Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

resolve nested packages/projects error #217

Closed
wants to merge 36 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
6abb8df
Merge Develop version 0.4.0 into Main
thebioengineer Oct 18, 2021
7e4f250
Merge branch 'develop' into release_0.4.0
thebioengineer Oct 28, 2021
5282766
Merge branch 'develop' into release_0.4.0
thebioengineer Nov 2, 2021
a28a050
Merge branch 'develop' into release_0.4.0
thebioengineer Nov 4, 2021
5d9a003
Merge pull request #203 from phuse-org/release_0.4.0
thebioengineer Nov 4, 2021
2ae0eeb
resolve nested packages/projects error
thebioengineer Nov 8, 2021
21455f2
Undo changes from debugging
thebioengineer Nov 8, 2021
d12e379
package has no data
slager Feb 22, 2024
434f3e9
adjust dependencies for R CMD check
slager Feb 22, 2024
8788306
roxygen2 version bump and document
slager Feb 22, 2024
880f38f
test fix, create package first in tempdir
slager Feb 22, 2024
7aa5e4f
fix tests to run non-interactively
slager Feb 22, 2024
38570d3
fix more tests, use helper fn
slager Feb 23, 2024
b22bd23
update paths for non-interactive setup
slager Feb 23, 2024
381a761
fix pesky kable test failure
slager Feb 23, 2024
9d035bf
make more tests non-interactive and fix
slager Feb 23, 2024
397818f
fix pkg name from temp pkg for test
slager Feb 24, 2024
71d3f27
rm dplyr dependency from edited test
slager Feb 24, 2024
9e92a03
fix test comparison to new actual
slager Feb 24, 2024
cb5244f
new regex to fix scrape check
slager Feb 25, 2024
de9420b
fix automated tests and paths
slager Feb 25, 2024
9825511
fix paths for test package
slager Feb 25, 2024
538f2d3
bump to development version
slager Feb 25, 2024
d41254b
rm commented old code
slager Feb 25, 2024
09fcd98
Merge remote-tracking branch 'origin/main' into dave
slager Feb 25, 2024
10551c2
Merge pull request #229 from slager/dave
slager Feb 25, 2024
00d8da0
use rproj file
slager Feb 25, 2024
6d8a31a
stop forcing gitattributes
slager Feb 25, 2024
0f4f76e
update github actions R CMD check CI
slager Feb 25, 2024
5f0fa25
setup tinytex in github actions CI to install pdflatex
slager Feb 25, 2024
a1042f4
add missing tinytex pkg to CI
slager Feb 25, 2024
b09f508
update test coverage github action
slager Feb 25, 2024
ce2c8e2
update pkgdown ci
slager Feb 25, 2024
9b22e5b
rm styler on pr gh action
slager Feb 25, 2024
2487fc9
repress new R CMD check notes from R-devel
slager Feb 26, 2024
bbf9c16
Merge branch 'main' into nested_projects_identifier
slager Feb 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ CONTRIBUTING.md

vignettes/validation/validation.yml
^man/figures/cheatsheets/*
^pkgdown$
8 changes: 0 additions & 8 deletions .gitattributes

This file was deleted.

107 changes: 20 additions & 87 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
@@ -1,19 +1,10 @@
# NOTE: This workflow is overkill for most R packages
# check-standard.yaml is likely a better choice
# usethis::use_github_action("check-standard") will install it.
#
# For help debugging build failures open an issue on the RStudio community with the 'github-actions' tag.
# https://community.rstudio.com/new-topic?category=Package%20development&tags=github-actions
# 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
- develop
branches: [main, master]

name: R-CMD-check

Expand All @@ -27,94 +18,36 @@ jobs:
fail-fast: false
matrix:
config:
- {os: macOS-latest, r: 'release'}
- {os: macos-latest, r: 'release'}
- {os: windows-latest, r: 'release'}
- {os: windows-latest, r: '3.6'}
- {os: ubuntu-18.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest", http-user-agent: "R/4.0.0 (ubuntu-18.04) R (4.0.0 x86_64-pc-linux-gnu x86_64 linux-gnu) on GitHub Actions" }
- {os: ubuntu-18.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
- {os: ubuntu-18.04, r: 'oldrel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
- {os: ubuntu-18.04, r: '3.5', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
# - {os: ubuntu-18.04, r: '3.4', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
# - {os: ubuntu-18.04, r: '3.3', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
- {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
- {os: ubuntu-latest, r: 'release'}
- {os: ubuntu-latest, r: 'oldrel-1'}

env:
RSPM: ${{ matrix.config.rspm }}
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
R_KEEP_PKG_SOURCE: yes

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

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

- 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-tinytex@v1
- uses: r-lib/actions/setup-tinytex@v2
- run: tlmgr --version
- run: tlmgr update -self
- run: tlmgr install multirow

- uses: r-lib/actions/setup-pandoc@master
with:
pandoc-version: '2.7.3'

- name: Install pak and query dependencies
run: |
install.packages("pak", repos = "https://r-lib.github.io/p/pak/dev/")
saveRDS(pak::pkg_deps("local::.", dependencies = TRUE), ".github/r-depends.rds")
shell: Rscript {0}

- name: install Poppler for macOS
if: runner.os == 'macOS'
run: brew install poppler pkgconfig
shell: bash

- name: Restore R package cache
uses: actions/cache@v2
- uses: r-lib/actions/setup-r-dependencies@v2
with:
path: |
${{ env.R_LIBS_USER }}
!${{ env.R_LIBS_USER }}/pak
key: ${{ matrix.config.os }}-${{ steps.install-r.outputs.installed-r-version }}-1-${{ hashFiles('.github/r-depends.rds') }}
restore-keys: ${{ matrix.config.os }}-${{ steps.install-r.outputs.installed-r-version }}-1-

- name: Install system dependencies
if: runner.os == 'Linux'
run: |
pak::local_system_requirements(execute = TRUE)
pak::pkg_system_requirements("rcmdcheck", execute = TRUE)
shell: Rscript {0}

- name: Install dependencies
run: |
pak::local_install_dev_deps(upgrade = TRUE)
pak::pkg_install("rcmdcheck")
shell: Rscript {0}

- name: Session info
run: |
options(width = 100)
pkgs <- installed.packages()[, "Package"]
sessioninfo::session_info(pkgs, include_base = TRUE)
shell: Rscript {0}

- name: Check
env:
_R_CHECK_CRAN_INCOMING_: false
run: |
options(crayon.enabled = TRUE)
rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check")
shell: Rscript {0}

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

- name: Upload check results
if: failure()
uses: actions/upload-artifact@main
- uses: r-lib/actions/check-r-package@v2
with:
name: ${{ matrix.config.os }}-r${{ matrix.config.r }}-results
path: check
upload-snapshots: true
78 changes: 32 additions & 46 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
@@ -1,66 +1,52 @@
# 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: ubuntu-18.04
runs-on: ubuntu-latest
# Only restrict concurrency for non-PR jobs
concurrency:
group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
env:
RSPM: https://packagemanager.rstudio.com/cran/__linux__/bionic/latest
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

permissions:
contents: write
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

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

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

- uses: r-lib/actions/setup-tinytex@v1
- uses: r-lib/actions/setup-tinytex@v2
- run: tlmgr --version
- run: tlmgr update -self
- run: tlmgr install multirow

- uses: r-lib/actions/setup-pandoc@master
- uses: r-lib/actions/setup-r-dependencies@v2
with:
pandoc-version: '2.7.3'
extra-packages: any::pkgdown, local::.
needs: website

- name: Install pak and query dependencies
run: |
install.packages("pak", repos = "https://r-lib.github.io/p/pak/dev/")
saveRDS(pak::pkg_deps("local::.", dependencies = TRUE), ".github/r-depends.rds")
- name: Build site
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
shell: Rscript {0}

- name: Restore R package cache
uses: actions/cache@v2
- name: Deploy to GitHub pages 🚀
if: github.event_name != 'pull_request'
uses: JamesIves/[email protected]
with:
path: |
${{ env.R_LIBS_USER }}
!${{ env.R_LIBS_USER }}/pak
key: ubuntu-18.04-${{ steps.install-r.outputs.installed-r-version }}-1-${{ hashFiles('.github/r-depends.rds') }}
restore-keys: ubuntu-18.04-${{ steps.install-r.outputs.installed-r-version }}-1-

- name: Install system dependencies
if: runner.os == 'Linux'
run: |
pak::local_system_requirements(execute = TRUE)
pak::pkg_system_requirements("pkgdown", execute = TRUE)
shell: Rscript {0}

- name: Install dependencies
run: |
pak::local_install_dev_deps(upgrade = TRUE)
pak::pkg_install("pkgdown")
shell: Rscript {0}

- name: Install package
run: R CMD INSTALL .

- name: Build and deploy pkgdown site
run: |
git config --local user.name "$GITHUB_ACTOR"
git config --local user.email "[email protected]"
Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE)'
clean: false
branch: gh-pages
folder: docs
55 changes: 0 additions & 55 deletions .github/workflows/pr-commands.yaml

This file was deleted.

Loading