Merge pull request #343 from carpentries/no-aws-deploy

No aws deploy; hotfix for renv

.Rbuildignore

@@ -12,3 +12,5 @@
 ^docs/*$
 ^testthat-problems.rds$
 ^testthat.Rout.fail$
+^renv/sandbox$
+

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

@@ -91,7 +91,7 @@ jobs:
         if: runner.os != 'Windows'
         run: |
           renv::init()
-          system('rm -rf renv .Rprofile')
+          system('rm -rf renv.lock renv .Rprofile')
           system('git clean -fd -e .github')
           system('git restore .')
         shell: Rscript {0}

.gitignore

@@ -5,4 +5,5 @@ inst/doc
 docs/
 *.fail
 testthat-problems.*
+renv/sandbox/*
 

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: sandpaper
 Title: Create and Curate Carpentries Lessons
-Version: 0.10.1
+Version: 0.10.2
 Authors@R: c(
     person(given = "Zhian N.",
            family = "Kamvar",

NEWS.md

@@ -1,3 +1,18 @@
+# sandpaper 0.10.2
+
+BUG FIX
+-------
+
+* The default `.gitignore` now has `renv/sandbox` to avoid a sandbox directory
+  from being tracked by git. (see https://github.com/rstudio/renv/issues/1088)
+
+CONTINUOUS INTEGRATION
+----------------------
+
+* The `deploy-aws.yaml` workflow has been removed as plans for its use is 
+  relegated to the beta stage of the workbench.
+
+
 # sandpaper 0.10.1
 
 NEW FEATURES

inst/templates/gitignore-template.txt

@@ -49,3 +49,5 @@ docs/
 # translation temp files
 po/*~
 
+# renv sandbox
+renv/sandbox

inst/workflows/README.md

@@ -49,16 +49,6 @@ the `renv.lock` file, respectively. If there is a problem with the cache,
 manual invaliation is necessary and can be done by setting the `CACHE_VERSION`
 secret to the current date.
 
-### Deploy to AWS (deploy-aws.yaml)
-
-If you have an AWS bucket that is set up to deploy the site from a folder, this
-workflow will deploy the site to that folder after `01 Build and Deploy` runs.
-It can also be triggered manually.
-
-Note: for this to work, you must have the `AWS_S3_BUCKET`, `AWS_ACCESS_KEY_ID`,
-and `AWS_SECRET_ACCESS_KEY` in your repository secrets. If any of these are
-missing, the workflow will not run.
-
 ## Updates
 
 ### Setup Information

tests/testthat/_snaps/create_lesson.md

@@ -25,6 +25,7 @@
       .Renviron
       docs/
       po/*~
+      renv/sandbox
 
 # Destruction of the .gitignore file renders the lesson incorrect [ansi]
 
@@ -53,6 +54,7 @@
       .Renviron
       docs/
       po/*~
+      renv/sandbox
 
 # Destruction of the .gitignore file renders the lesson incorrect [unicode]
 
@@ -81,6 +83,7 @@
       .Renviron
       docs/
       po/*~
+      renv/sandbox
 
 # Destruction of the .gitignore file renders the lesson incorrect [fancy]
 
@@ -109,4 +112,5 @@
       .Renviron
       docs/
       po/*~
+      renv/sandbox
 

tests/testthat/test-manage_deps.R

@@ -44,10 +44,14 @@ test_that("manage_deps() will create a renv folder", {
   skip_on_cran()
   skip_on_os("windows")
   rnv <- fs::path(lsn, "renv")
-  fs::file_move(rnv, fs::path(lsn, "vner"))
+  # need to move renv folder outside of the lesson or it will detect the
+  # suggested packages within the package and chaos will ensue
+  tmp <- withr::local_tempfile()
+  fs::dir_create(tmp)
+  fs::file_move(rnv, tmp)
   withr::defer({
     fs::dir_delete(rnv)
-    fs::file_move(fs::path(lsn, "vner"), rnv) 
+    fs::file_move(fs::path(tmp, "renv"), rnv) 
   })
   expect_false(fs::dir_exists(rnv))