Skip to content

Commit d5eb990

Browse files
committed
check no-multiarch if win+devel
1 parent eb7cbed commit d5eb990

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- {os: windows-latest, r: 'devel'}
2727
- {os: macOS-latest, r: 'release'}
2828
- {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
29-
- {os: ubuntu-20.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
29+
- {os: ubuntu-20.04, r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest", http-user-agent: "R/4.1.0 (ubuntu-20.04) R (4.1.0 x86_64-pc-linux-gnu x86_64 linux-gnu) on GitHub Actions" }
3030

3131
env:
3232
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
@@ -49,8 +49,7 @@ jobs:
4949
writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
5050
shell: Rscript {0}
5151

52-
- name: Cache R packages
53-
if: runner.os != 'Windows'
52+
- name: Restore R package cache
5453
uses: actions/cache@v2
5554
with:
5655
path: ${{ env.R_LIBS_USER }}
@@ -76,7 +75,12 @@ jobs:
7675
_R_CHECK_CRAN_INCOMING_REMOTE_: false
7776
run: |
7877
options(crayon.enabled = TRUE)
79-
rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check")
78+
args <- if (.Platform$OS.type == "windows" & R.version$status == "devel") {
79+
c("--no-manual", "--as-cran", "--no-multiarch")
80+
} else {
81+
c("--no-manual", "--as-cran")
82+
}
83+
rcmdcheck::rcmdcheck(args = args, error_on = "warning", check_dir = "check")
8084
shell: Rscript {0}
8185

8286
- name: Upload check results

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: gitdown
22
Title: Turn Your Git Commit Messages into a HTML Book
3-
Version: 0.1.2.9000
3+
Version: 0.1.3
44
Authors@R:
55
c(person(given = "Sébastien",
66
family = "Rochette",

NEWS.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# gitdown (development version)
22

3+
# gitdown 0.1.3
4+
5+
* Protect tests from bad time rounding
6+
37
# gitdown 0.1.2
48

59
* Protect from older Pandoc versions

0 commit comments

Comments
 (0)