Merge branch 'master' of https://www.github.com/helske/walker

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

@@ -22,9 +22,11 @@ jobs:
  fail-fast: false
  matrix:
  config:
+ - {os: macOS-latest, r: 'release'}
  - {os: windows-latest, r: 'release'}
- - {os: macOS-latest, r: 'release'}
- - {os: ubuntu-20.04, r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
+ - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'}
+ - {os: ubuntu-latest, r: 'release'}
+ - {os: ubuntu-latest, r: 'oldrel-1'}
 
  env:
  R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
@@ -34,11 +36,11 @@ jobs:
  steps:
  - uses: actions/checkout@v2
 
- - uses: r-lib/actions/setup-r@v1
+ - uses: r-lib/actions/setup-r@v2
  with:
  r-version: ${{ matrix.config.r }}
 
- - uses: r-lib/actions/setup-pandoc@v1
+ - uses: r-lib/actions/setup-pandoc@v2
 
  - name: Query dependencies
  run: |
@@ -63,11 +65,10 @@ jobs:
  eval sudo $cmd
  done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "20.04"))')
 
- - name: Install dependencies
- run: |
- remotes::install_deps(dependencies = TRUE)
- remotes::install_cran("rcmdcheck")
- shell: Rscript {0}
+ - uses: r-lib/actions/setup-r-dependencies@v2
+ with:
+ extra-packages: any::rcmdcheck
+ needs: check
 
  - name: Check
  env:

configure

@@ -1,5 +1,5 @@
+# Generated by rstantools. Do not edit by hand.
+
 #! /bin/sh
 "${R_HOME}/bin/Rscript" -e "rstantools::rstan_config()"
-# the flags below are now added manually as Makevars is also configured manually until rstantools updates
-#"${R_HOME}/bin/Rscript" -e 'cat("PKG_LIBS += $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)", sep = "\n", file = "src/Makevars", append = TRUE)'
-#"${R_HOME}/bin/Rscript" -e 'cat("PKG_LIBS += $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)", sep = "\n", file = "src/Makevars.win", append = TRUE)'
+echo "PKG_LIBS += \$(LAPACK_LIBS) \$(BLAS_LIBS) \$(FLIBS)" >> src/Makevars

configure.win

@@ -1,7 +1,5 @@
+# Generated by rstantools. Do not edit by hand.
+
 #! /bin/sh
 "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "rstantools::rstan_config()"
-# the flags below are now added manually as Makevars is also configured manually until rstantools updates
-#"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e 'cat("PKG_LIBS += $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)", sep = "\n", file = "src/Makevars.win", append = TRUE)'
-# This needs some trickery in order to ensure LF line endings without need to fight with git (actions)
-#"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e 'f<-"src/Makevars";l<-c(readLines(f),"PKG_LIBS += $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)");f<-file(f, "wb");cat(l,sep = "\n",file=f);close(f)'
-
+echo "PKG_LIBS += \$(LAPACK_LIBS) \$(BLAS_LIBS) \$(FLIBS)" >> src/Makevars.win

src/RcppExports.cpp

@@ -61,18 +61,9 @@ BEGIN_RCPP
 END_RCPP
 }
 
-RcppExport SEXP _rcpp_module_boot_stan_fit4rw1_model_mod();
-RcppExport SEXP _rcpp_module_boot_stan_fit4rw1_model_naive_mod();
-RcppExport SEXP _rcpp_module_boot_stan_fit4walker_glm_mod();
-RcppExport SEXP _rcpp_module_boot_stan_fit4walker_lm_mod();
-
 static const R_CallMethodDef CallEntries[] = {
  {"_walker_predict_walker", (DL_FUNC) &_walker_predict_walker, 13},
  {"_walker_predict_walker_glm", (DL_FUNC) &_walker_predict_walker_glm, 15},
- {"_rcpp_module_boot_stan_fit4rw1_model_mod", (DL_FUNC) &_rcpp_module_boot_stan_fit4rw1_model_mod, 0},
- {"_rcpp_module_boot_stan_fit4rw1_model_naive_mod", (DL_FUNC) &_rcpp_module_boot_stan_fit4rw1_model_naive_mod, 0},
- {"_rcpp_module_boot_stan_fit4walker_glm_mod", (DL_FUNC) &_rcpp_module_boot_stan_fit4walker_glm_mod, 0},
- {"_rcpp_module_boot_stan_fit4walker_lm_mod", (DL_FUNC) &_rcpp_module_boot_stan_fit4walker_lm_mod, 0},
  {NULL, NULL, 0}
 };