Skip to content

RTools45 compatibility #1066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrjohns merged 3 commits into from
Mar 27, 2025
Merged

RTools45 compatibility #1066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4577977
RTools45 compatibility
andrjohns Mar 17, 2025
c75bd13
Bump r-lib/actions from 2.11.2 to 2.11.3
dependabot[bot] Mar 24, 2025
1457a70
Use rtools45 in actions
andrjohns Mar 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/R-CMD-check-wsl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ jobs:

- uses: actions/checkout@v4

- uses: r-lib/actions/setup-r@v2.11.2
- uses: r-lib/actions/setup-pandoc@v2.11.2
- uses: r-lib/actions/setup-r@v2.11.3
- uses: r-lib/actions/setup-pandoc@v2.11.3

- uses: r-lib/actions/setup-r-dependencies@v2.11.2
- uses: r-lib/actions/setup-r-dependencies@v2.11.3
with:
extra-packages: any::rcmdcheck, local::.

Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
sessioninfo::session_info(pkgs, include_base = TRUE)
shell: Rscript {0}

- uses: r-lib/actions/check-r-package@v2.11.2
- uses: r-lib/actions/check-r-package@v2.11.3
env:
_R_CHECK_CRAN_INCOMING_: false

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/R-CMD-check.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
config:
- {os: macOS-latest, r: 'devel', rtools: '', opencl: true}
- {os: macOS-latest, r: 'release', rtools: '', opencl: true}
- {os: windows-latest, r: 'devel', rtools: '44'}
- {os: windows-latest, r: 'devel', rtools: '45'}
- {os: windows-latest, r: 'release', rtools: '44'}
- {os: windows-latest, r: 'oldrel', rtools: '43'}
- {os: ubuntu-latest, r: 'devel', rtools: '', opencl: true}
Expand All @@ -50,14 +50,14 @@ jobs:

- uses: actions/checkout@v4

- uses: r-lib/actions/setup-r@v2.11.2
- uses: r-lib/actions/setup-r@v2.11.3
with:
r-version: ${{ matrix.config.r }}
rtools-version: ${{ matrix.config.rtools }}

- uses: r-lib/actions/setup-pandoc@v2.11.2
- uses: r-lib/actions/setup-pandoc@v2.11.3

- uses: r-lib/actions/setup-r-dependencies@v2.11.2
- uses: r-lib/actions/setup-r-dependencies@v2.11.3
with:
cache: "always"
extra-packages: any::rcmdcheck, local::.
Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:
sessioninfo::session_info(pkgs, include_base = TRUE)
shell: Rscript {0}

- uses: r-lib/actions/check-r-package@v2.11.2
- uses: r-lib/actions/check-r-package@v2.11.3
env:
_R_CHECK_CRAN_INCOMING_: false

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/Test-coverage.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ jobs:
if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"
- uses: actions/checkout@v4

- uses: r-lib/actions/setup-r@v2.11.2
- uses: r-lib/actions/setup-pandoc@v2.11.2
- uses: r-lib/actions/setup-r@v2.11.3
- uses: r-lib/actions/setup-pandoc@v2.11.3

- uses: r-lib/actions/setup-r-dependencies@v2.11.2
- uses: r-lib/actions/setup-r-dependencies@v2.11.3
with:
extra-packages: any::rcmdcheck, local::., any::covr, any::gridExtra

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cmdstan-tarball-check.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ jobs:
sudo apt-get install -y libcurl4-openssl-dev || true
sudo apt-get install -y openmpi-bin openmpi-common libopenmpi-dev || true

- uses: r-lib/actions/setup-r@v2.11.2
- uses: r-lib/actions/setup-r@v2.11.3
with:
r-version: ${{ matrix.config.r }}
rtools-version: ${{ matrix.config.rtools }}

- uses: r-lib/actions/setup-pandoc@v2.11.2
- uses: r-lib/actions/setup-pandoc@v2.11.3

- name: Query dependencies
run: |
Expand Down
4 changes: 3 additions & 1 deletion R/install.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,8 +895,10 @@ rtools4x_version <- function() {
rtools_ver <- "42"
} else if (R.version$minor < "4.0") {
rtools_ver <- "43"
} else {
} else if (R.version$minor < "5.0") {
rtools_ver <- "44"
} else {
rtools_ver <- "45"
}
rtools_ver
}
Expand Down