Merge pull request #411 from ldecicco-USGS/main

GitLab ci updates

.gitlab-ci.yml

@@ -19,7 +19,6 @@ variables:
   _R_CHECK_DONTTEST_EXAMPLES_: "false"
   R_PROFILE: "$R_HOME/etc/Rprofile.site"
   APT_CACHE: "$CI_PROJECT_DIR/ci/lib/apt-cache"
-  CRAN: "https://rpkg.chs.usgs.gov/prod-cran/latest"
   R_LIBS_USER: "$CI_PROJECT_DIR/ci/lib"
   R_LIBS: "$CI_PROJECT_DIR/ci/lib"
   BUILD_LOGS_DIR: "$CI_PROJECT_DIR/ci/logs"
@@ -103,8 +102,9 @@ pages:
   only: 
     - main
   script:
+    - echo -e "options(repos=c(DEV = '${DEV}', CRAN = '${CRAN}'));" >> $R_PROFILE
+    - Rscript -e 'install.packages("toxEval", repos = Sys.getenv("DEV")); packageVersion("toxEval"); source("deploy_simple.R")'
     - Rscript -e 'pkgdown::build_site(override = list(destination = "public"))'
-    - Rscript -e 'source("deploy_simple.R")'
   artifacts:
     paths:
       - $PAGES_OUTDIR

deploy_simple.R

@@ -2,8 +2,6 @@ library(connectapi)
 client <- connect(server = Sys.getenv("CONNECT_SERVER"),
                   api_key = Sys.getenv("CONNECT_API_KEY"))
 
-install.packages("toxEval", repos = "https://rpkg.chs.usgs.gov/prod-cran/latest")
-
 rsconnect::writeManifest(appDir = "./inst/shiny")
 bundle <- bundle_dir("./inst/shiny")