Merge branch 'main' into test-pre-preview

joelostblom · Sep 5, 2024 · a397ec1 · a397ec1
2 parents d982992 + 0e6106a
commit a397ec1
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 8 deletions.
diff --git a/.github/workflows/pr-diff-and-deploy-preview.yaml b/.github/workflows/pr-diff-and-deploy-preview.yaml
@@ -19,15 +19,21 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - uses: r-lib/actions/setup-r@v2
+    - uses: conda-incubator/setup-miniconda@v3
       with:
-        use-public-rspm: true
-    - uses: r-lib/actions/setup-r-dependencies@v2
-      with:
-        cache-version: 2
-        extra-packages: |
-          any::ggplot2
-          any::rcmdcheck
+        environment-file: environment.yaml
+        activate-environment: viz-oer
+        auto-activate-base: false
+
+    # - uses: r-lib/actions/setup-r@v2
+    #   with:
+    #     use-public-rspm: true
+    # - uses: r-lib/actions/setup-r-dependencies@v2
+    #   with:
+    #     cache-version: 2
+    #     extra-packages: |
+    #       any::ggplot2
+    #       any::rcmdcheck
 
 
     # steps:

diff --git a/environment.yaml b/environment.yaml
@@ -0,0 +1,32 @@
+name: 'viz-oer'
+channels:
+    - conda-forge
+    - r
+    - defaults
+dependencies:
+    - python=3.12.*
+    - pip
+    - ipykernel
+    - altair-all
+    - vega-datasets
+    - scipy
+    - matplotlib
+    - seaborn
+    - rpy2
+    - quarto
+    - r-base>=4.1
+    - r-essentials
+    - r-devtools
+    - r-gert
+    - r-usethis
+    - r-testthat
+    - r-startup
+    - r-rmarkdown
+    - r-stringi
+    - r-tidyverse
+    - r-hmisc
+    - r-rjson
+    - r-ggally
+    - r-ggthemes
+    - r-cowplot
+    - r-reticulate