update deps

iNZightVIT · Aug 19, 2024 · b429e5c · b429e5c
1 parent 7a02f58
commit b429e5c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/.github/install_deps.R b/.github/install_deps.R
@@ -2,12 +2,14 @@
 github_deps <- c(
     "tmelliott/surveyspec",
     # "tmelliott/gWidgets2@patch-1",
+    "cran/Matrix@1.6-5",
+    "cran/MatrixModels@0.5-2",
     "cran/maptools",
     "cran/rgdal",
     "cran/rgeos",
     "iNZightVIT/gWidgets2RGtk2@inz",
     "iNZightVIT/iNZightTools@2.0.1",
-    "iNZightVIT/iNZightTS@1.5.10",
+    "iNZightVIT/iNZightTS@1.5.10", # aka iNZightTSLegacy
     "iNZightVIT/iNZightMR@2.3.0",
     "iNZightVIT/iNZightPlots@2.15.0",
     "iNZightVIT/iNZightRegression@1.3.3",
@@ -18,13 +20,21 @@ github_deps <- c(
 OS <- Sys.getenv("OS_TYPE")
 options(
     repos = c(
-        if (OS == "Linux") RSPM <- Sys.getenv("RSPM"),
+        # if (OS == "Linux") RSPM <- Sys.getenv("RSPM"),
         inzight = "https://r.docker.stat.auckland.ac.nz",
         CRAN = "https://cloud.r-project.org"
     )
     # install.packages.compile.from.source = "never"
 )
 
+if (!requireNamespace("pak", quietly = TRUE)) {
+    install.packages("pak", type = "source")
+}
+
+pak::pak(c(github_deps, "", dependencies = TRUE)
+pak::local_install_dev_deps(dependencies = TRUE, upgrade = FALSE)
+pak::pak("rcmdcheck")
+
 # if (OS == "Linux" &&
 #     !requireNamespace("units", quietly = TRUE) &&
 #     getRversion() >= "4.3") {
@@ -53,11 +63,3 @@ options(
 #     INSTALL_opts = "--no-multiarch"
 # )
 # remotes::install_cran("rcmdcheck")
-
-if (!requireNamespace("pak", quietly = TRUE)) {
-    install.packages("pak", type = "source")
-}
-
-pak::pak(github_deps, dependencies = TRUE)
-pak::local_install_dev_deps(dependencies = TRUE, upgrade = FALSE)
-pak::pak("rcmdcheck")
diff --git a/.github/workflows/R-CMD-CHECK.yaml b/.github/workflows/R-CMD-CHECK.yaml
@@ -21,15 +21,15 @@ jobs:
           - {
               os: ubuntu-20.04,
               r: "4.2",
-              rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest",
+              # rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest",
               cache-version: 2,
             }
-          # - {
-          #     os: ubuntu-20.04,
-          #     r: "4.2",
-          #     rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest",
-          #     cache-version: 3,
-          #   }
+          - {
+              os: ubuntu-20.04,
+              r: "4.2",
+              # rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest",
+              cache-version: 3,
+            }
 
     env:
       R_REMOTES_NO_ERRORS_FROM_WARNINGS: true