Merge branch 'master' into fix-toolchain-checks-windows

Author: rok-cesnovar

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

@@ -23,14 +23,14 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {os: macOS-latest, r: 'devel'}
-          - {os: macOS-latest, r: 'release'}
-          - {os: windows-latest, r: 'devel'}
-          - {os: windows-latest, r: 'release'}
-          - {os: windows-latest, r: 'oldrel'}
-          - {os: ubuntu-20.04, r: 'devel'}
-          - {os: ubuntu-20.04, r: 'release'}
-          - {os: ubuntu-20.04, r: 'oldrel'}
+          - {os: macOS-latest, r: 'devel', rtools: ''}
+          - {os: macOS-latest, r: 'release', rtools: ''}
+          - {os: windows-latest, r: 'devel', rtools: '42'}
+          - {os: windows-latest, r: 'release', rtools: '42'}
+          - {os: windows-latest, r: 'oldrel', rtools: '40'}
+          - {os: ubuntu-20.04, r: 'devel', rtools: ''}
+          - {os: ubuntu-20.04, r: 'release', rtools: ''}
+          - {os: ubuntu-20.04, r: 'oldrel', rtools: ''}
     env:
       R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
@@ -56,17 +56,10 @@ 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
+      - uses: r-lib/actions/setup-r@v2.2.3
         with:
           r-version: ${{ matrix.config.r }}
-      - name: Install Rtools42
-        if: runner.os == 'Windows'
-        run: |
-          $source = 'https://cran.r-project.org/bin/windows/Rtools/rtools42/files/rtools42-5253-5107.exe'
-          $destination = '../rtools42.exe'
-          Invoke-WebRequest -Uri $source -OutFile $destination
-          Start-Process -FilePath ../rtools42.exe -ArgumentList /VERYSILENT -NoNewWindow -Wait
-        shell: powershell
+          rtools-version: ${{ matrix.config.rtools }}
       - uses: r-lib/actions/setup-pandoc@v1
 
       - name: Query dependencies
@@ -94,7 +87,6 @@ jobs:
 
       - name: Install cmdstan
         run: |
-          print(list.files("C:/rtools42"))
           cmdstanr::check_cmdstan_toolchain(fix = TRUE)
           cmdstanr::install_cmdstan(cores = 2)
         shell: Rscript {0}

.github/workflows/Test-coverage.yaml

@@ -85,17 +85,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: r-lib/actions/setup-r@v2
+      - uses: r-lib/actions/setup-r@v2.2.3
         with:
           r-version: 'release'
-      - name: Install Rtools42
-        if: runner.os == 'Windows'
-        run: |
-          $source = 'https://cran.r-project.org/bin/windows/Rtools/rtools42/files/rtools42-5253-5107.exe'
-          $destination = '../rtools42.exe'
-          Invoke-WebRequest -Uri $source -OutFile $destination
-          Start-Process -FilePath ../rtools42.exe -ArgumentList /VERYSILENT -NoNewWindow -Wait
-        shell: powershell
+          rtools-version: '42'
 
       - uses: r-lib/actions/setup-pandoc@v1
 

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

@@ -22,9 +22,9 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {os: macOS-latest, r: 'release'}
-          - {os: windows-latest, r: 'release'}
-          - {os: ubuntu-20.04, r: 'release'}
+          - {os: macOS-latest, r: 'release', rtools: ''}
+          - {os: windows-latest, r: 'release', rtools: '42'}
+          - {os: ubuntu-20.04, r: 'release', rtools: ''}
     env:
       R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
@@ -33,38 +33,18 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-
-      - name: Set path for RTools 4.0
-        if: runner.os == 'Windows'
-        run: echo "C:/rtools40/usr/bin;C:/rtools40/mingw64/bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
-
-      - name: Install mingw32-make and check toolchain path
-        if: runner.os == 'Windows'
-        run: |
-          pacman -Syu mingw-w64-x86_64-make --noconfirm
-          g++ --version
-          Get-Command g++ | Select-Object -ExpandProperty Definition
-          mingw32-make --version
-          Get-Command mingw32-make | Select-Object -ExpandProperty Definition
-        shell: powershell
-
       - name: Install system dependencies
         if: runner.os == 'Linux'
         run: |
           sudo apt-get update
           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@v1
+
+      - uses: r-lib/actions/setup-r@v2.2.3
         with:
           r-version: ${{ matrix.config.r }}
-      - name: Install Rtools42
-        if: runner.os == 'Windows'
-        run: |
-          $source = 'https://cran.r-project.org/bin/windows/Rtools/rtools42/files/rtools42-5253-5107.exe'
-          $destination = '../rtools42.exe'
-          Invoke-WebRequest -Uri $source -OutFile $destination
-          Start-Process -FilePath ../rtools42.exe -ArgumentList /VERYSILENT -NoNewWindow -Wait
-        shell: powershell
+          rtools-version: ${{ matrix.config.rtools }}
+
       - uses: r-lib/actions/setup-pandoc@v1
 
       - name: Query dependencies

tests/testthat/test-model-compile.R

@@ -105,7 +105,8 @@ test_that("compilation works with include_paths", {
 
   expect_interactive_message(
     mod_w_include <- cmdstan_model(stan_file = stan_program_w_include, quiet = TRUE,
-                                   include_paths = test_path("resources", "stan")),
+                                   include_paths = test_path("resources", "stan"),
+                                   force_recompile = TRUE),
     "Compiling Stan program"
   )
   expect_equal(
@@ -580,7 +581,7 @@ test_that("cmdstan_model errors with no args ", {
 })
 
 test_that("cmdstan_model works with user_header", {
-  skip_if(os_is_macos())
+  skip_if(os_is_macos() | os_is_windows()) 
   tmpfile <- tempfile(fileext = ".hpp")
   hpp <-
   "