Skip to content

Commit d4397a8

Browse files
committed
Merge branch 'master' into remove-deprecated
2 parents 93eb6af + 453084b commit d4397a8

239 files changed

Lines changed: 1440 additions & 31633 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/R-CMD-check-wsl.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ jobs:
3636
token: ${{ secrets.GITHUB_TOKEN }}
3737
if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"
3838

39-
- uses: actions/checkout@v4
39+
- uses: actions/checkout@v6
4040

41-
- uses: r-lib/actions/setup-r@v2.11.2
42-
- uses: r-lib/actions/setup-pandoc@v2.11.2
41+
- uses: r-lib/actions/setup-r@v2
42+
- uses: r-lib/actions/setup-pandoc@v2
4343

44-
- uses: r-lib/actions/setup-r-dependencies@v2.11.2
44+
- uses: r-lib/actions/setup-r-dependencies@v2
4545
with:
4646
extra-packages: any::rcmdcheck, local::.
4747

48-
- uses: Vampire/setup-wsl@v5
48+
- uses: Vampire/setup-wsl@v6
4949
with:
5050
distribution: Ubuntu-22.04
5151
wsl-version: 2
@@ -71,7 +71,7 @@ jobs:
7171
sessioninfo::session_info(pkgs, include_base = TRUE)
7272
shell: Rscript {0}
7373

74-
- uses: r-lib/actions/check-r-package@v2.11.2
74+
- uses: r-lib/actions/check-r-package@v2
7575
env:
7676
_R_CHECK_CRAN_INCOMING_: false
7777

@@ -82,7 +82,7 @@ jobs:
8282

8383
- name: Upload check results
8484
if: failure()
85-
uses: actions/upload-artifact@v4
85+
uses: actions/upload-artifact@v6
8686
with:
8787
name: wsl-backend-results
8888
path: check

.github/workflows/R-CMD-check.yaml

Lines changed: 38 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ name: Unit tests
1111
pull_request:
1212
branches:
1313
- master
14+
workflow_dispatch:
15+
inputs:
16+
tarball_url:
17+
description: 'CmdStan tarball URL to test with.'
18+
required: false
19+
default: ''
1420

1521
jobs:
1622
R-CMD-check:
@@ -23,19 +29,21 @@ jobs:
2329
fail-fast: false
2430
matrix:
2531
config:
26-
- {os: macOS-latest, r: 'devel', rtools: '', opencl: true}
27-
- {os: macOS-latest, r: 'release', rtools: '', opencl: true}
28-
- {os: windows-latest, r: 'devel', rtools: '44'}
29-
- {os: windows-latest, r: 'release', rtools: '44'}
30-
- {os: windows-latest, r: 'oldrel', rtools: '43'}
31-
- {os: ubuntu-latest, r: 'devel', rtools: '', opencl: true}
32-
- {os: ubuntu-latest, r: 'release', rtools: '', opencl: true}
33-
- {os: ubuntu-latest, r: 'oldrel', rtools: '', opencl: true}
32+
- {os: macOS-latest, r: 'devel', opencl: true}
33+
- {os: macOS-latest, r: 'release', opencl: true}
34+
- {os: windows-latest, r: 'devel' }
35+
- {os: windows-latest, r: 'release'}
36+
- {os: windows-latest, r: 'oldrel'}
37+
- {os: ubuntu-latest, r: 'devel', opencl: true}
38+
- {os: ubuntu-latest, r: 'release', opencl: true}
39+
- {os: ubuntu-latest, r: 'oldrel', opencl: true}
3440
env:
3541
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
3642
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
3743
NOT_CRAN: true
3844
CMDSTANR_OPENCL_TESTS: ${{ matrix.config.opencl }}
45+
CMDSTAN_TEST_TARBALL_URL: ${{ github.event.inputs.tarball_url }}
46+
PKG_SYSREQS_DB_UPDATE_TIMEOUT: 30s
3947

4048
steps:
4149
- name: cmdstan env vars
@@ -48,16 +56,21 @@ jobs:
4856
token: ${{ secrets.GITHUB_TOKEN }}
4957
if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"
5058

51-
- uses: actions/checkout@v4
59+
- uses: actions/checkout@v6
5260

53-
- uses: r-lib/actions/setup-r@v2.11.2
61+
- uses: r-lib/actions/setup-r@v2
5462
with:
5563
r-version: ${{ matrix.config.r }}
56-
rtools-version: ${{ matrix.config.rtools }}
5764

58-
- uses: r-lib/actions/setup-pandoc@v2.11.2
65+
- name: Install R Package Build Dependencies on MacOS
66+
if: ${{ runner.os == 'macOS' }}
67+
uses: r-hub/actions/setup-r-sysreqs@v1
68+
with:
69+
type: 'minimal'
70+
71+
- uses: r-lib/actions/setup-pandoc@v2
5972

60-
- uses: r-lib/actions/setup-r-dependencies@v2.11.2
73+
- uses: r-lib/actions/setup-r-dependencies@v2
6174
with:
6275
cache: "always"
6376
extra-packages: any::rcmdcheck, local::.
@@ -80,7 +93,16 @@ jobs:
8093
- name: Install cmdstan
8194
run: |
8295
cmdstanr::check_cmdstan_toolchain(fix = TRUE)
83-
cmdstanr::install_cmdstan(cores = 2)
96+
tarball_url <- Sys.getenv("CMDSTAN_TEST_TARBALL_URL")
97+
if (nzchar(tarball_url)) {
98+
cmdstanr::install_cmdstan(
99+
cores = 2,
100+
overwrite = TRUE,
101+
release_url = tarball_url
102+
)
103+
} else {
104+
cmdstanr::install_cmdstan(cores = 2)
105+
}
84106
shell: Rscript {0}
85107

86108
- name: Session info
@@ -90,7 +112,7 @@ jobs:
90112
sessioninfo::session_info(pkgs, include_base = TRUE)
91113
shell: Rscript {0}
92114

93-
- uses: r-lib/actions/check-r-package@v2.11.2
115+
- uses: r-lib/actions/check-r-package@v2
94116
env:
95117
_R_CHECK_CRAN_INCOMING_: false
96118

@@ -101,7 +123,7 @@ jobs:
101123

102124
- name: Upload check results
103125
if: failure()
104-
uses: actions/upload-artifact@v4
126+
uses: actions/upload-artifact@v6
105127
with:
106128
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
107129
path: check

.github/workflows/Test-coverage.yaml

Lines changed: 58 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
# Github Actions workflow to analyze CmdStanR code, test coverage
33
# yamllint disable rule:line-length
44

5-
name: Test coverage
6-
7-
'on':
5+
on:
86
push:
97
branches:
108
- master
119
pull_request:
12-
branches:
13-
- master
10+
11+
name: Test coverage
12+
13+
permissions: read-all
1414

1515
jobs:
1616
test-coverage:
@@ -38,16 +38,18 @@ jobs:
3838
- uses: n1hility/cancel-previous-runs@v3
3939
with:
4040
token: ${{ secrets.GITHUB_TOKEN }}
41-
workflow: Test-coverage.yml
41+
workflow: Test-coverage.yaml
4242
if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"
43-
- uses: actions/checkout@v4
4443

45-
- uses: r-lib/actions/setup-r@v2.11.2
46-
- uses: r-lib/actions/setup-pandoc@v2.11.2
44+
- uses: actions/checkout@v6
45+
46+
- uses: r-lib/actions/setup-r@v2
47+
- uses: r-lib/actions/setup-pandoc@v2
4748

48-
- uses: r-lib/actions/setup-r-dependencies@v2.11.2
49+
- uses: r-lib/actions/setup-r-dependencies@v2
4950
with:
50-
extra-packages: any::rcmdcheck, local::., any::covr, any::gridExtra
51+
extra-packages: any::rcmdcheck, local::., any::covr, any::gridExtra, any::xml2
52+
needs: coverage
5153

5254
- name: Install cmdstan
5355
run: |
@@ -57,12 +59,55 @@ jobs:
5759

5860
- name: Test coverage (Linux)
5961
if: runner.os == 'Linux'
60-
run: covr::codecov(type = "tests")
62+
run: |
63+
cov <- covr::package_coverage(
64+
quiet = FALSE,
65+
clean = FALSE,
66+
install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package"),
67+
type = "tests"
68+
)
69+
print(cov)
70+
covr::to_cobertura(cov)
6171
shell: Rscript {0}
72+
env:
73+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
6274

6375
- name: Test coverage (Windows)
6476
if: runner.os == 'Windows'
6577
run: |
6678
options(covr.gcov = 'C:/rtools44/mingw64/bin/gcov.exe');
67-
covr::codecov(type = "tests", function_exclusions = "sample_mpi")
79+
cov <- covr::package_coverage(
80+
quiet = FALSE,
81+
clean = FALSE,
82+
install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package"),
83+
type = "tests",
84+
function_exclusions = "sample_mpi"
85+
)
86+
print(cov)
87+
covr::to_cobertura(cov)
6888
shell: Rscript {0}
89+
env:
90+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
91+
92+
- uses: codecov/codecov-action@v5
93+
with:
94+
# Fail if error if not on PR, or if on PR and token is given
95+
fail_ci_if_error: ${{ github.event_name != 'pull_request' || secrets.CODECOV_TOKEN }}
96+
files: ./cobertura.xml
97+
plugins: noop
98+
disable_search: true
99+
token: ${{ secrets.CODECOV_TOKEN }}
100+
101+
- name: Show testthat output
102+
if: always()
103+
run: |
104+
## --------------------------------------------------------------------
105+
find '${{ runner.temp }}/package' -name 'testthat.Rout*' -exec cat '{}' \; || true
106+
shell: bash
107+
108+
- name: Upload test results
109+
if: failure()
110+
uses: actions/upload-artifact@v6
111+
with:
112+
name: coverage-test-failures
113+
path: ${{ runner.temp }}/package

.github/workflows/cmdstan-tarball-check.yaml

Lines changed: 0 additions & 101 deletions
This file was deleted.

0 commit comments

Comments
 (0)