Skip to content

Commit 787eba9

Browse files
Update intro vignette
1 parent eccebe9 commit 787eba9

File tree

4 files changed

+35
-39
lines changed

4 files changed

+35
-39
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: future.tests
22
Title: Test Suite for 'Future API' Backends
3-
Version: 0.7.0-9003
3+
Version: 0.7.0-9004
44
Authors@R: c(
55
person("Henrik", "Bengtsson", role = c("aut", "cre", "cph"), email = "[email protected]"),
66
person(family = "The R Consortium", comment = "Project was awared an Infrastructure Steering Committee (ISC) grant in 2017", role = "fnd"))

OVERVIEW.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ All future backends implementing the Future API should validate that they confor
2424
### From Outside R
2525

2626
```sh
27-
$ Rscript -e future.tests::check --args --test-plan="multisession"
27+
$ Rscript -e future.tests::check --test-plan="multisession"
2828
$ exit_code=$?
2929
$ [[ exit_code -eq 0 ]] || { >&2 echo "One or more tests failed"; exit 1; }
3030
```
3131

3232

3333
[R]: https://www.r-project.org
34-
[future]: https://cran.r-project.org/package=future
35-
[future.callr]: https://cran.r-project.org/package=future.callr
36-
[future.batchtools]: https://cran.r-project.org/package=future.batchtools
37-
[future.tests]: https://cran.r-project.org/package=future.tests
34+
[future]: https://future.futureverse.org
35+
[future.callr]: https://future.callr.futureverse.org
36+
[future.batchtools]: https://future.batchtools.futureverse.org
37+
[future.tests]: https://future.tests.futureverse.org
3838
[Future API Backend Specification]: https://future.futureverse.org/articles/future-6-future-api-backend-specification.html

inst/WORDLIST

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@ stringsAsFactors
1212
travis
1313
yml
1414
TestResult
15+
backend's
16+
hardcoded

vignettes/future.tests-05-ci-github_actions.md

Lines changed: 27 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
timeout-minutes: 30
2828

29-
runs-on: ubuntu-20.04
29+
runs-on: ubuntu-latest
3030

3131
name: future.plan=${{ matrix.future.plan }}
3232

@@ -39,61 +39,55 @@ jobs:
3939
- { plan: 'multisession' }
4040
- { plan: 'sequential' }
4141
- { plan: 'future.batchtools::batchtools_local' }
42+
- { plan: 'future.batchtools::batchtools_bash' }
4243
- { plan: 'future.callr::callr' }
44+
- { plan: 'future.mirai::mirai_multisession' }
45+
- { plan: 'future.mirai::mirai_cluster' }
4346

4447
env:
4548
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
46-
RSPM: https://packagemanager.rstudio.com/cran/__linux__/focal/latest
4749
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
4850
## R CMD check
49-
_R_CHECK_LENGTH_1_CONDITION_: true
50-
_R_CHECK_LENGTH_1_LOGIC2_: true
5151
_R_CHECK_MATRIX_DATA_: true
5252
_R_CHECK_CRAN_INCOMING_: false
5353
## Specific to futures
5454
R_FUTURE_RNG_ONMISUSE: error
5555

5656
steps:
57-
- uses: actions/checkout@v3
57+
- uses: actions/checkout@v4
5858

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

6161
- uses: r-lib/actions/setup-r@v2
6262
with:
63-
r-version: release
63+
use-public-rspm: true
6464

65-
- name: Query R package dependencies
66-
run: |
67-
install.packages('remotes')
68-
saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
69-
writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
70-
shell: Rscript {0}
71-
72-
- name: Cache R packages
73-
uses: actions/cache@v3
65+
- uses: r-lib/actions/setup-r-dependencies@v2
7466
with:
75-
path: ${{ env.R_LIBS_USER }}
76-
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
77-
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
78-
79-
- name: Install R package system dependencies (Linux)
80-
if: runner.os == 'Linux'
81-
env:
82-
RHUB_PLATFORM: linux-x86_64-ubuntu-gcc
67+
extra-packages: |
68+
any::rcmdcheck
69+
any::remotes
70+
any::sessioninfo
71+
any::covr
72+
needs: check
73+
74+
- name: Install dependencies
8375
run: |
84-
Rscript -e "remotes::install_github('r-hub/sysreqs')"
85-
sysreqs=$(Rscript -e "cat(sysreqs::sysreq_commands('DESCRIPTION'))")
86-
sudo -s eval "$sysreqs"
76+
remotes::install_deps(dependencies = TRUE)
77+
install.packages(".", repos=NULL, type="source")
78+
shell: Rscript {0}
8779

88-
- name: Install R package dependencies
80+
- name: Session info
8981
run: |
90-
remotes::install_deps(dependencies = TRUE)
91-
install.packages(".", repos=NULL, type="source") ## needed by parallel workers
82+
options(width = 100)
83+
pkgs <- installed.packages()[, "Package"]
84+
sessioninfo::session_info(pkgs, include_base = TRUE)
9285
shell: Rscript {0}
9386

9487
- name: Install 'future.tests' and any backend R packages
9588
run: |
9689
remotes::install_cran("future.tests")
90+
remotes::install_github("HenrikBengtsson/future.tests", ref="develop")
9791
if (grepl("::", plan <- "${{ matrix.future.plan }}") && nzchar(pkg <- sub("::.*", "", plan))) install.packages(pkg)
9892
shell: Rscript {0}
9993

@@ -112,14 +106,14 @@ jobs:
112106
113107
- name: Upload check results
114108
if: failure()
115-
uses: actions/upload-artifact@v3
109+
uses: actions/upload-artifact@v4
116110
with:
117111
name: ${{ runner.os }}-r${{ matrix.future.plan }}-results
118112
path: check
119113
```
120114
121-
For real-world examples, see the GitHub repositories of [**future**](https://github.com/futureverse/future), [**future.batchtools**](https://github.com/futureverse/future.batchtools), and [**future.callr**](https://github.com/futureverse/future.callr).
115+
For real-world examples, see the GitHub repositories of [**future**](https://github.com/futureverse/future), [**future.batchtools**](https://github.com/futureverse/future.batchtools), [**future.callr**](https://github.com/futureverse/future.callr), and [**future.callr**](https://github.com/futureverse/future.mirai).
122116
123117
[R]: https://www.r-project.org
124-
[future]: https://cran.r-project.org/package=future
125-
[future.tests]: https://cran.r-project.org/package=future.tests
118+
[future]: https://future.futureverse.org
119+
[future.tests]: https://future.tests.futureverse.org

0 commit comments

Comments
 (0)