diff --git a/.github/workflows/covr.yaml b/.github/workflows/covr.yaml index 81af6c74..3ac1bc6b 100644 --- a/.github/workflows/covr.yaml +++ b/.github/workflows/covr.yaml @@ -71,3 +71,4 @@ jobs: print(coverage) covr::codecov(coverage = coverage, token="${{secrets.CODECOV_TOKEN}}") shell: Rscript {0} + diff --git a/.github/workflows/future_tests.yaml b/.github/workflows/future_tests.yaml index 788d520e..6f7efb37 100644 --- a/.github/workflows/future_tests.yaml +++ b/.github/workflows/future_tests.yaml @@ -8,7 +8,7 @@ jobs: timeout-minutes: 30 - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest name: future.plan=${{ matrix.future.plan }} @@ -26,7 +26,6 @@ jobs: env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} - RSPM: https://packagemanager.rstudio.com/cran/__linux__/jammy/latest R_REMOTES_NO_ERRORS_FROM_WARNINGS: true ## R CMD check _R_CHECK_LENGTH_1_LOGIC2_: true @@ -42,35 +41,28 @@ jobs: - uses: r-lib/actions/setup-r@v2 with: - r-version: release + use-public-rspm: true - - name: Query R package 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} - - - name: Cache R packages - uses: actions/cache@v3 + - 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::rcmdcheck + any::remotes + any::sessioninfo + any::covr + needs: check - - name: Install R package system dependencies (Linux) - if: runner.os == 'Linux' - env: - RHUB_PLATFORM: linux-x86_64-ubuntu-gcc + - name: Install dependencies run: | - Rscript -e "remotes::install_github('r-hub/sysreqs')" - sysreqs=$(Rscript -e "cat(sysreqs::sysreq_commands('DESCRIPTION'))") - sudo -s eval "$sysreqs" + remotes::install_deps(dependencies = TRUE) + install.packages(".", repos=NULL, type="source") + shell: Rscript {0} - - name: Install R package dependencies + - name: Session info run: | - remotes::install_deps(dependencies = TRUE) - install.packages(".", repos=NULL, type="source") ## needed by parallel workers + options(width = 100) + pkgs <- installed.packages()[, "Package"] + sessioninfo::session_info(pkgs, include_base = TRUE) shell: Rscript {0} - name: Install 'future.tests' and any backend R packages diff --git a/.github/workflows/revdepcheck-top.yaml b/.github/workflows/revdepcheck-top.yaml index d3a9d55d..1c70317d 100644 --- a/.github/workflows/revdepcheck-top.yaml +++ b/.github/workflows/revdepcheck-top.yaml @@ -8,7 +8,7 @@ jobs: timeout-minutes: 30 - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest name: ${{ matrix.config.pkg }} (${{ matrix.config.r }}) ${{ matrix.config.label }} @@ -51,36 +51,21 @@ jobs: - uses: r-lib/actions/setup-r@v2 with: r-version: ${{ matrix.config.r }} + use-public-rspm: true - - 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} - - - name: Cache R packages - if: runner.os != 'Windows' - uses: actions/cache@v3 + - 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- - - - name: Install system dependencies (Linux) - if: runner.os == 'Linux' - env: - RHUB_PLATFORM: linux-x86_64-ubuntu-gcc - run: | - Rscript -e "remotes::install_github('r-hub/sysreqs')" - sysreqs=$(Rscript -e "cat(sysreqs::sysreq_commands('DESCRIPTION'))") - sudo -s eval "$sysreqs" + extra-packages: | + any::rcmdcheck + any::remotes + any::sessioninfo + any::covr + needs: check - name: Install dependencies run: | remotes::install_deps(dependencies = TRUE) - remotes::install_cran("rcmdcheck") - install.packages(".", repos=NULL, type="source") ## needed by parallel workers + install.packages(".", repos=NULL, type="source") install.packages("${{ matrix.config.pkg }}", dependencies=TRUE) shell: Rscript {0}