Merge 30869a8 into 730e61a

.github/workflows/render-bookdown.yml

@@ -80,6 +80,10 @@ jobs:
           jhudsl/course_template \
           Rscript -e "bookdown::render_book('index.Rmd', output_format = 'all')"
 
+      # We want a fresh run of the renders each time
+      - name: Copy over assets
+        run: cp -r assets/ docs/assets/
+
 ##### If you do not wish to host your course on Coursera, you can delete this section #####
       # Run Coursera version
       - name: Run Coursera version of render

.github/workflows/render-leanpub.yml

@@ -6,14 +6,14 @@ name: Render and publish Leanpub
 on:
   workflow_dispatch:
 ### UNCOMMENT THIS SECTION IF YOU WISH PREPARE YOUR COURSE FOR LEANPUB AUTOMATICALLY
-#  pull_request:
-#    branches: [ main ]
-#    types: [closed]
-#    paths:
-#      - '**.Rmd'
-#      - docker/*
-#      - assets/*
-#      - quizzes/*
+  # pull_request:
+  #   branches: [ main ]
+  #   type: [closed]
+  #   paths:
+  #     - '**.Rmd'
+  #     - docker/*
+  #     - assets/*
+  #     - quizzes/*
 ######### END OF SECTION #########
 
 jobs:
@@ -37,13 +37,17 @@ jobs:
       # Run leanpub rendering
       - name: Run the screenshot creation
         run: |
-          chapt_urls=$(Rscript --vanilla scripts/get_chapter_urls.R \
+          chapt_urls=$(Rscript --vanilla scripts/make_screenshots.R \
             --git_pat ${{ secrets.GH_PAT }} \
             --repo $GITHUB_REPOSITORY)
 
-      # Run leanpub rendering
-      - name: Run ottr::bookdown_to_leanpub
-        run: Rscript -e "ottr::bookdown_to_leanpub(make_book_txt = TRUE)"
+      # Run Leanpub rendering
+      - name: Run ottr::bookdown_to_embed_leanpub
+        run: |
+          rm -r manuscript
+          Rscript -e "ottr::bookdown_to_embed_leanpub( \
+            chapt_img_key = 'resources/chapt_screen_images/chapter_urls.tsv', \
+            make_book_txt = TRUE)"
 
       # Convert quizzes to Coursera format
       - name: Convert quizzes to coursera
@@ -56,5 +60,5 @@ jobs:
           git config --local user.name "GitHub Actions"
           git add -A
           git add --force manuscript/*
-          git commit -m 'Render leanpub' || echo "No changes to commit"
+          git commit -m 'Render Leanpub' || echo "No changes to commit"
           git push origin main || echo "No changes to push"

docker/Dockerfile

@@ -58,16 +58,16 @@ RUN Rscript -e  "install.packages( \
       'styler', \
       'reticulate'))"
 
-# Copy over git token and package list
-COPY git_token.txt .
-COPY github_package_list.tsv .
-
 # cow needs this dependency:
 RUN Rscript -e  "devtools::install_version('gitcreds', version = '0.1.1', repos = 'http://cran.us.r-project.org')"
 
 # Didactr needs this dependency:
 RUN Rscript -e  "devtools::install_version('lifecycle', version = '1.0.0', repos = 'http://cran.us.r-project.org')"
 
+# Copy over git token and package list
+COPY git_token.txt .
+COPY github_package_list.tsv .
+
 # Install packages from github
 RUN Rscript install_github.R \
   --packages github_package_list.tsv \

docker/Dockerfile_ottr

@@ -0,0 +1,29 @@
+FROM jhudsl/course_template
+LABEL maintainer="cansav09@gmail.com"
+
+# Install apt-getable packages to start
+RUN apt-get update && apt-get install -y --no-install-recommends apt-utils dialog
+
+RUN apt-get install -y --no-install-recommends \
+    libxt6 \
+    libpoppler-cpp-dev \
+    vim \
+    libglpk40 \
+    curl \
+    gpg
+
+# Install R
+RUN apt-get update && apt-get install -y r-base curl
+
+# Install R packages
+RUN Rscript -e  "install.packages('curl')"
+
+# Install phantomjs
+RUN apt-get update && apt-get install build-essential chrpath libssl-dev libxft-dev -y \
+  && apt-get install libfontconfig1 libfontconfig1-dev -y \
+  && cd ~ && export PHANTOM_JS="phantomjs-2.1.1-linux-x86_64" \
+  && wget https://github.com/Medium/phantomjs/releases/download/v2.1.1/$PHANTOM_JS.tar.bz2 \
+  && sudo tar xvjf $PHANTOM_JS.tar.bz2 \
+  && sudo mv $PHANTOM_JS /usr/local/share \
+  && sudo ln -sf /usr/local/share/$PHANTOM_JS/bin/phantomjs /usr/local/bin \
+  && phantomjs --version