Skip to content

Commit 31163e0

Browse files
GHA: Better identification of future backend package
1 parent 54883d8 commit 31163e0

File tree

5 files changed

+20
-18
lines changed

5 files changed

+20
-18
lines changed

.github/workflows/future_tests-future.batchtools.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ jobs:
6060

6161
- name: Install 'future.tests' and any backend R packages
6262
run: |
63-
if (grepl("::", plan <- "${{ matrix.future.plan }}") &&
64-
nzchar(pkg <- sub("::.*", "", plan))) {
65-
install.packages(pkg)
66-
}
63+
## Identify and install future backend package in 'plan' variable, if any
64+
plan <- "${{ matrix.future.plan }}"
65+
pattern <- ".*(future[.][[:alnum:]]+)::[[:alnum:]]+.*"
66+
if (grepl(pattern, plan) && nzchar(pkg <- sub(pattern, "\\1", plan))) install.packages(pkg)
6767
shell: Rscript {0}
6868

6969
- name: Session info

.github/workflows/future_tests-future.callr.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ jobs:
5959

6060
- name: Install 'future.tests' and any backend R packages
6161
run: |
62-
if (grepl("::", plan <- "${{ matrix.future.plan }}") &&
63-
nzchar(pkg <- sub("::.*", "", plan))) {
64-
install.packages(pkg)
65-
}
62+
## Identify and install future backend package in 'plan' variable, if any
63+
plan <- "${{ matrix.future.plan }}"
64+
pattern <- ".*(future[.][[:alnum:]]+)::[[:alnum:]]+.*"
65+
if (grepl(pattern, plan) && nzchar(pkg <- sub(pattern, "\\1", plan))) install.packages(pkg)
6666
shell: Rscript {0}
6767

6868
- name: Session info

.github/workflows/future_tests-future.mirai.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ jobs:
6060

6161
- name: Install 'future.tests' and any backend R packages
6262
run: |
63-
if (grepl("::", plan <- "${{ matrix.future.plan }}") &&
64-
nzchar(pkg <- sub("::.*", "", plan))) {
65-
install.packages(pkg)
66-
}
63+
## Identify and install future backend package in 'plan' variable, if any
64+
plan <- "${{ matrix.future.plan }}"
65+
pattern <- ".*(future[.][[:alnum:]]+)::[[:alnum:]]+.*"
66+
if (grepl(pattern, plan) && nzchar(pkg <- sub(pattern, "\\1", plan))) install.packages(pkg)
6767
shell: Rscript {0}
6868

6969
- name: Session info

.github/workflows/future_tests-future.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ jobs:
6262

6363
- name: Install 'future.tests' and any backend R packages
6464
run: |
65-
if (grepl("::", plan <- "${{ matrix.future.plan }}") &&
66-
nzchar(pkg <- sub("::.*", "", plan))) {
67-
install.packages(pkg)
68-
}
65+
## Identify and install future backend package in 'plan' variable, if any
66+
plan <- "${{ matrix.future.plan }}"
67+
pattern <- ".*(future[.][[:alnum:]]+)::[[:alnum:]]+.*"
68+
if (grepl(pattern, plan) && nzchar(pkg <- sub(pattern, "\\1", plan))) install.packages(pkg)
6969
shell: Rscript {0}
7070

7171
- name: Session info

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,10 @@ jobs:
8787
- name: Install 'future.tests' and any backend R packages
8888
run: |
8989
remotes::install_cran("future.tests")
90-
remotes::install_github("HenrikBengtsson/future.tests", ref="develop")
91-
if (grepl("::", plan <- "${{ matrix.future.plan }}") && nzchar(pkg <- sub("::.*", "", plan))) install.packages(pkg)
90+
## Identify and install future backend package in 'plan' variable, if any
91+
plan <- "${{ matrix.future.plan }}"
92+
pattern <- ".*(future[.][[:alnum:]]+)::[[:alnum:]]+.*"
93+
if (grepl(pattern, plan) && nzchar(pkg <- sub(pattern, "\\1", plan))) install.packages(pkg)
9294
shell: Rscript {0}
9395

9496
- name: Session info

0 commit comments

Comments
 (0)