Skip to content

Commit 8af58b8

Browse files
authored
Merge pull request #952 from stan-dev/rtools44-compat
Add handling for new rtools version
2 parents 1a07f46 + e4c279b commit 8af58b8

File tree

5 files changed

+13
-17
lines changed

5 files changed

+13
-17
lines changed

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,8 @@ jobs:
3737

3838
- uses: actions/checkout@v4
3939

40-
- uses: r-lib/actions/[email protected]
41-
with:
42-
r-version: 'release'
43-
rtools-version: '42'
44-
- uses: r-lib/actions/[email protected]
40+
- uses: r-lib/actions/[email protected]
41+
- uses: r-lib/actions/[email protected]
4542

4643
- name: Query dependencies
4744
run: |

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ jobs:
5757
sudo apt-get install -y libcurl4-openssl-dev || true
5858
sudo apt-get install -y openmpi-bin openmpi-common libopenmpi-dev || true
5959
60-
- uses: r-lib/actions/[email protected].4
60+
- uses: r-lib/actions/[email protected].7
6161
with:
6262
r-version: ${{ matrix.config.r }}
6363
rtools-version: ${{ matrix.config.rtools }}
64-
- uses: r-lib/actions/[email protected].4
64+
- uses: r-lib/actions/[email protected].7
6565

6666
- name: Query dependencies
6767
run: |

.github/workflows/Test-coverage.yaml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ jobs:
3434
if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"
3535
- uses: actions/checkout@v4
3636

37-
- uses: r-lib/actions/[email protected].4
38-
- uses: r-lib/actions/[email protected].4
37+
- uses: r-lib/actions/[email protected].7
38+
- uses: r-lib/actions/[email protected].7
3939

4040
- name: Install Ubuntu dependencies
4141
run: |
@@ -85,12 +85,9 @@ jobs:
8585
steps:
8686
- uses: actions/checkout@v4
8787

88-
- uses: r-lib/actions/[email protected]
89-
with:
90-
r-version: 'release'
91-
rtools-version: '42'
88+
- uses: r-lib/actions/[email protected]
9289

93-
- uses: r-lib/actions/[email protected].4
90+
- uses: r-lib/actions/[email protected].7
9491

9592
- name: Query dependencies
9693
run: |

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ jobs:
4040
sudo apt-get install -y libcurl4-openssl-dev || true
4141
sudo apt-get install -y openmpi-bin openmpi-common libopenmpi-dev || true
4242
43-
- uses: r-lib/actions/[email protected].4
43+
- uses: r-lib/actions/[email protected].7
4444
with:
4545
r-version: ${{ matrix.config.r }}
4646
rtools-version: ${{ matrix.config.rtools }}
4747

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

5050
- name: Query dependencies
5151
run: |

R/install.R

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -855,8 +855,10 @@ rtools4x_version <- function() {
855855
rtools_ver <- "40"
856856
} else if (R.version$minor < "3.0") {
857857
rtools_ver <- "42"
858-
} else {
858+
} else if (R.version$minor < "5.0") {
859859
rtools_ver <- "43"
860+
} else {
861+
rtools_ver <- "44"
860862
}
861863
rtools_ver
862864
}

0 commit comments

Comments
 (0)