Skip to content

Commit f9e5e20

Browse files
committed
Merge branch 'master' into use-qs2
2 parents 223e85d + 6606bc2 commit f9e5e20

File tree

5 files changed

+11
-7
lines changed

5 files changed

+11
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107

108108
- name: Upload check results
109109
if: failure()
110-
uses: actions/upload-artifact@v5
110+
uses: actions/upload-artifact@v6
111111
with:
112112
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
113113
path: check

.github/workflows/Test-coverage.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107

108108
- name: Upload test results
109109
if: failure()
110-
uses: actions/upload-artifact@v5
110+
uses: actions/upload-artifact@v6
111111
with:
112112
name: coverage-test-failures
113113
path: ${{ runner.temp }}/package

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656

5757
- name: Cache R packages
5858
if: runner.os != 'Windows'
59-
uses: actions/cache@v4
59+
uses: actions/cache@v5
6060
with:
6161
path: ${{ env.R_LIBS_USER }}
6262
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
@@ -95,7 +95,7 @@ jobs:
9595

9696
- name: Upload check results
9797
if: failure()
98-
uses: actions/upload-artifact@v5
98+
uses: actions/upload-artifact@v6
9999
with:
100100
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
101101
path: check

tests/testthat/test-csv.R

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,12 @@ test_that("read_cmdstan_csv() fails if the file does not exist", {
8484
test_that("read_cmdstan_csv() fails with empty csv file", {
8585
file_path <- test_path("resources", "csv", "empty.csv")
8686
file.create(file_path)
87-
expect_error(read_cmdstan_csv(file_path),
88-
"Supplied CSV file is corrupt!")
87+
error_msg <- if (utils::packageVersion("data.table") >= "1.18.0") {
88+
"External command failed"
89+
} else {
90+
"Supplied CSV file is corrupt"
91+
}
92+
expect_error(read_cmdstan_csv(file_path), error_msg, fixed = TRUE)
8993
file.remove(file_path)
9094
})
9195

0 commit comments

Comments
 (0)