Merge branch 'master' into reduce-test-output

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

@@ -37,10 +37,10 @@ jobs:
 
       - uses: actions/checkout@v4
 
-      - uses: r-lib/actions/[email protected].0
-      - uses: r-lib/actions/[email protected].0
+      - uses: r-lib/actions/[email protected].1
+      - uses: r-lib/actions/[email protected].1
 
-      - uses: r-lib/actions/[email protected].0
+      - uses: r-lib/actions/[email protected].1
         with:
           extra-packages: any::rcmdcheck, local::.
 
@@ -71,7 +71,7 @@ jobs:
           sessioninfo::session_info(pkgs, include_base = TRUE)
         shell: Rscript {0}
 
-      - uses: r-lib/actions/[email protected].0
+      - uses: r-lib/actions/[email protected].1
         env:
           _R_CHECK_CRAN_INCOMING_: false
 

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

@@ -55,14 +55,14 @@ jobs:
 
       - uses: actions/checkout@v4
 
-      - uses: r-lib/actions/[email protected].0
+      - uses: r-lib/actions/[email protected].1
         with:
           r-version: ${{ matrix.config.r }}
           rtools-version: ${{ matrix.config.rtools }}
 
-      - uses: r-lib/actions/[email protected].0
+      - uses: r-lib/actions/[email protected].1
 
-      - uses: r-lib/actions/[email protected].0
+      - uses: r-lib/actions/[email protected].1
         with:
           extra-packages: any::rcmdcheck, local::.
 
@@ -79,7 +79,7 @@ jobs:
           sessioninfo::session_info(pkgs, include_base = TRUE)
         shell: Rscript {0}
 
-      - uses: r-lib/actions/[email protected].0
+      - uses: r-lib/actions/[email protected].1
         env:
           _R_CHECK_CRAN_INCOMING_: false
 

.github/workflows/Test-coverage.yaml

@@ -42,10 +42,10 @@ jobs:
         if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/master'"
       - uses: actions/checkout@v4
 
-      - uses: r-lib/actions/[email protected].0
-      - uses: r-lib/actions/[email protected].0
+      - uses: r-lib/actions/[email protected].1
+      - uses: r-lib/actions/[email protected].1
 
-      - uses: r-lib/actions/[email protected].0
+      - uses: r-lib/actions/[email protected].1
         with:
           extra-packages: any::rcmdcheck, local::., any::covr, any::gridExtra
 

.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/[email protected].0
+      - uses: r-lib/actions/[email protected].1
         with:
           r-version: ${{ matrix.config.r }}
           rtools-version: ${{ matrix.config.rtools }}
 
-      - uses: r-lib/actions/[email protected].0
+      - uses: r-lib/actions/[email protected].1
 
       - name: Query dependencies
         run: |

R/utils.R

@@ -92,8 +92,11 @@ arch_is_aarch64 <- function() {
 }
 
 # Returns the type of make command to use to compile depending on the OS
+# First checks if $MAKE is set, otherwise falls back to system-specific default
 make_cmd <- function() {
-  if (os_is_windows() && !os_is_wsl() && (Sys.getenv("CMDSTANR_USE_RTOOLS") == "")) {
+  if (Sys.getenv("MAKE") != "") {
+    Sys.getenv("MAKE")
+  } else if (os_is_windows() && !os_is_wsl() && (Sys.getenv("CMDSTANR_USE_RTOOLS") == "")) {
     "mingw32-make.exe"
   } else {
     "make"