merge dev

Merge branch 'dev'

# Conflicts:
#	.github/workflows/bookdown-build-and-deploy.yml
#	.gitignore
#	Dockerfile
#	m1_admin.R
#	renv.lock

Author: jengelaere

.github/.gitignore

@@ -10,7 +10,7 @@ on:
 
 jobs:
   build-and-deploy-bookdown:
-    name: Build and bookdown
-    uses: MTES-MCT/parcours-r/.github/workflows/bookdown-build-and-deploy.yml@master
+    name: Build and deploy bookdown
+    uses: MTES-MCT/parcours-r/.github/workflows/bookdown-build-from-desc-and-deploy.yml@master
     with:
-      r_version: '4.0.4'
+      r_version: '4.2.1'

.github/workflows/bookdown-build-and-deploy.yml

@@ -0,0 +1,14 @@
+name: Test compilation de parcours_r_module1_socle_introduction
+
+on:
+  pull_request:
+    branches: [main, master, dev, dev-ci]
+    
+  workflow_dispatch:
+
+jobs:
+  build-bookdown:
+    name: Build bookdown
+    uses: MTES-MCT/parcours-r/.github/workflows/bookdown-build-from-desc.yml@master
+    with:
+      r_version: '4.2.1'

.github/workflows/bookdown-build.yml

@@ -5,21 +5,23 @@ on:
     branches:
       - main
       - master
+      - dev
     paths:
       - .github/workflows/rstudio-image-build.yml
       - Dockerfile
-      - renv.lock
+      - DESCRIPTION
 
   pull_request:
     types:
       - created
     branches:
       - main
       - master
+      - dev
     paths:
       - .github/workflows/rstudio-image-build.yml
       - Dockerfile
-      - renv.lock
+      - DESCRIPTION
 
   workflow_dispatch:
 

.github/workflows/deploy_bookdown.yml

@@ -2,7 +2,9 @@
 .Rhistory
 .RData
 .Ruserdata
+*.html
 _book
 _bookdown_files
-output/**
-z_archives/**
+output/*
+z_archives/*
+

.github/workflows/rstudio-image-build.yml

@@ -0,0 +1,20 @@
+Type: Book
+Package: M1-Parcours-R
+Title: Formation à R Module 1 socle introduction
+Version: 0.1.0
+Description: Valise pédagogique pour la formation à R
+License: MIT
+URL: https://github.com/MTES-MCT/parcours_r_socle_introduction
+Imports: 
+    bookdown,
+    COGiter,
+    GGally,
+    knitr,
+    plotly,
+    sf,
+    stringi,
+    tidyverse
+Remotes: 
+    MaelTheuliere/COGiter
+Encoding: UTF-8
+RoxygenNote: 7.2.1

.gitignore

@@ -1,9 +1,8 @@
 ARG R_VERSION=4.2.1
+ARG GITHUB_PAT=${{ secrets.GITHUB_TOKEN }}
 
 FROM inseefrlab/onyxia-rstudio:r${R_VERSION}
-ENV RENV_VERSION 0.16.0
 RUN apt-get update && apt-get install -y cargo
 RUN R -e "install.packages('remotes', repos = c(CRAN = 'https://cloud.r-project.org'))"
-RUN R -e "remotes::install_github('rstudio/renv@${RENV_VERSION}')"
-COPY renv.lock renv.lock
-RUN R -e 'renv::restore()'
+COPY DESCRIPTION DESCRIPTION
+RUN R -e 'remotes::install_deps(dependencies = TRUE)'

DESCRIPTION

@@ -24,4 +24,10 @@ propre.rpls::creer_pdf_book(
     "exercices-pour-r-studio.html"
   ))
 
-                                        
+imports <- sort(c("bookdown", attachment::att_from_rmds(path = ".", pattern = ".Rmd", recursive = FALSE, inline = TRUE)))
+attachment::att_to_desc_from_is(
+  path.d = "DESCRIPTION",
+  imports = imports, suggests = NULL, 
+  must.exist = FALSE
+)
+