diff --git a/.github/workflows/R-CMD-check-wsl.yaml b/.github/workflows/R-CMD-check-wsl.yaml index 7d399dee..a62e58b8 100644 --- a/.github/workflows/R-CMD-check-wsl.yaml +++ b/.github/workflows/R-CMD-check-wsl.yaml @@ -37,11 +37,8 @@ jobs: - uses: actions/checkout@v4 - - uses: r-lib/actions/setup-r@v2.8.6 - with: - r-version: 'release' - rtools-version: '43' - - uses: r-lib/actions/setup-pandoc@v2.8.6 + - uses: r-lib/actions/setup-r@v2.8.7 + - uses: r-lib/actions/setup-pandoc@v2.8.7 - name: Query dependencies run: | @@ -58,7 +55,7 @@ jobs: install.packages("curl") shell: Rscript {0} - - uses: Vampire/setup-wsl@v2 + - uses: Vampire/setup-wsl@v3 with: distribution: Ubuntu-22.04 use-cache: 'false' diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index d313201a..f8dbb29e 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -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/setup-r@v2.8.6 + - uses: r-lib/actions/setup-r@v2.8.7 with: r-version: ${{ matrix.config.r }} rtools-version: ${{ matrix.config.rtools }} - - uses: r-lib/actions/setup-pandoc@v2.8.6 + - uses: r-lib/actions/setup-pandoc@v2.8.7 - name: Query dependencies run: | diff --git a/.github/workflows/Test-coverage.yaml b/.github/workflows/Test-coverage.yaml index 0df32cca..549361aa 100644 --- a/.github/workflows/Test-coverage.yaml +++ b/.github/workflows/Test-coverage.yaml @@ -34,8 +34,8 @@ jobs: if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'" - uses: actions/checkout@v4 - - uses: r-lib/actions/setup-r@v2.8.6 - - uses: r-lib/actions/setup-pandoc@v2.8.6 + - uses: r-lib/actions/setup-r@v2.8.7 + - uses: r-lib/actions/setup-pandoc@v2.8.7 - name: Install Ubuntu dependencies run: | @@ -85,12 +85,9 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: r-lib/actions/setup-r@v2.8.6 - with: - r-version: 'release' - rtools-version: '43' + - uses: r-lib/actions/setup-r@v2.8.7 - - uses: r-lib/actions/setup-pandoc@v2.8.6 + - uses: r-lib/actions/setup-pandoc@v2.8.7 - name: Query dependencies run: | diff --git a/.github/workflows/cmdstan-tarball-check.yaml b/.github/workflows/cmdstan-tarball-check.yaml index 7ab3f5a1..79b17ba1 100644 --- a/.github/workflows/cmdstan-tarball-check.yaml +++ b/.github/workflows/cmdstan-tarball-check.yaml @@ -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.8.6 + - uses: r-lib/actions/setup-r@v2.8.7 with: r-version: ${{ matrix.config.r }} rtools-version: ${{ matrix.config.rtools }} - - uses: r-lib/actions/setup-pandoc@v2.8.6 + - uses: r-lib/actions/setup-pandoc@v2.8.7 - name: Query dependencies run: | diff --git a/R/install.R b/R/install.R index 7d92f5e9..995c14a9 100644 --- a/R/install.R +++ b/R/install.R @@ -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 }