Skip to content

Commit

Permalink
Merge pull request #952 from stan-dev/rtools44-compat
Browse files Browse the repository at this point in the history
Add handling for new rtools version
  • Loading branch information
andrjohns authored Apr 19, 2024
2 parents 1a07f46 + e4c279b commit 8af58b8
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 17 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/R-CMD-check-wsl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,8 @@ jobs:

- uses: actions/checkout@v4

- uses: r-lib/actions/[email protected]
with:
r-version: 'release'
rtools-version: '42'
- uses: r-lib/actions/[email protected]
- uses: r-lib/actions/[email protected]
- uses: r-lib/actions/[email protected]

- name: Query dependencies
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ 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/[email protected].4
- uses: r-lib/actions/[email protected].7
with:
r-version: ${{ matrix.config.r }}
rtools-version: ${{ matrix.config.rtools }}
- uses: r-lib/actions/[email protected].4
- uses: r-lib/actions/[email protected].7

- name: Query dependencies
run: |
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/Test-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ jobs:
if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"
- uses: actions/checkout@v4

- uses: r-lib/actions/[email protected].4
- uses: r-lib/actions/[email protected].4
- uses: r-lib/actions/[email protected].7
- uses: r-lib/actions/[email protected].7

- name: Install Ubuntu dependencies
run: |
Expand Down Expand Up @@ -85,12 +85,9 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: r-lib/actions/[email protected]
with:
r-version: 'release'
rtools-version: '42'
- uses: r-lib/actions/[email protected]

- uses: r-lib/actions/[email protected].4
- uses: r-lib/actions/[email protected].7

- name: Query dependencies
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cmdstan-tarball-check.yaml
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/[email protected].4
- uses: r-lib/actions/[email protected].7
with:
r-version: ${{ matrix.config.r }}
rtools-version: ${{ matrix.config.rtools }}

- uses: r-lib/actions/[email protected].4
- uses: r-lib/actions/[email protected].7

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

2 comments on commit 8af58b8

@strengejacke
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

May I ask why rtools 4.3 is required when R 4.4 is installed? rtools 4.4 is recommended for R 4.4 and higher, and now cmdstanr doesn't work anymore on R 4.4 because I don't have rtools 4.3 anymore.
Is there a compatibility issue, or would it be possible to make cmdstan(r) work with R 4.4 and rtools 4.4? That'd be great!

@andrjohns
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

May I ask why rtools 4.3 is required when R 4.4 is installed? rtools 4.4 is recommended for R 4.4 and higher, and now cmdstanr doesn't work anymore on R 4.4 because I don't have rtools 4.3 anymore. Is there a compatibility issue, or would it be possible to make cmdstan(r) work with R 4.4 and rtools 4.4? That'd be great!

Just a typo, is being fixed now

Please sign in to comment.