From 951140e21659bf1676d78e3a0e59a340e448a49d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Fran=C3=A7ois=20Michonneau?= <francois.michonneau@gmail.com>
Date: Fri, 8 Jan 2021 17:15:59 +0100
Subject: [PATCH] pin ubuntu version to 20.04 (#540)

Co-authored-by: Zhian N. Kamvar <zkamvar@gmail.com>
---
 .github/workflows/template.yml | 13 +++++++++----
 .github/workflows/website.yml  |  6 +++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/template.yml b/.github/workflows/template.yml
index 0fe9fd5..7e86e02 100644
--- a/.github/workflows/template.yml
+++ b/.github/workflows/template.yml
@@ -12,9 +12,9 @@ jobs:
       fail-fast: false
       matrix:
         lesson: [swcarpentry/shell-novice, datacarpentry/r-intro-geospatial, librarycarpentry/lc-git]
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-20.04, macos-latest, windows-latest]
         include:
-          - os: ubuntu-latest
+          - os: ubuntu-20.04
             os-name: Ubuntu
           - os: macos-latest
             os-name: macOS
@@ -30,7 +30,7 @@ jobs:
       run:
         shell: bash # forces 'Git for Windows' on Windows
     env:
-      RSPM: 'https://packagemanager.rstudio.com/cran/__linux__/bionic/latest'
+      RSPM: 'https://packagemanager.rstudio.com/cran/__linux__/focal/latest'
     steps:
       - name: Set up Ruby
         uses: actions/setup-ruby@v1
@@ -118,6 +118,11 @@ jobs:
           key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
           restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
 
+      - name: Install stringi from source
+        if: runner.os == 'Linux' && steps.check-rmd.outputs.count != 0
+        run: install.packages('stringi', repos='https://cloud.r-project.org')
+        shell: Rscript {0}
+
       - name: Install system dependencies for R packages
         if: runner.os == 'Linux' && steps.check-rmd.outputs.count != 0
         working-directory: lesson
@@ -125,7 +130,7 @@ jobs:
           while read -r cmd
           do
             eval sudo $cmd
-          done < <(Rscript -e 'cat(remotes::system_requirements("ubuntu", "18.04"), sep = "\n")')
+          done < <(Rscript -e 'cat(remotes::system_requirements("ubuntu", "20.04"), sep = "\n")')
 
       - run: make site
         working-directory: lesson
diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
index 70deeb2..b67e07e 100644
--- a/.github/workflows/website.yml
+++ b/.github/workflows/website.yml
@@ -8,9 +8,9 @@ on:
 jobs:
   build-website:
     if: ${{ !endsWith(github.repository, '/styles') }}
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     env:
-      RSPM: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"
+      RSPM: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     defaults:
       run:
@@ -81,7 +81,7 @@ jobs:
           while read -r cmd
           do
             eval sudo $cmd
-          done < <(Rscript -e 'cat(remotes::system_requirements("ubuntu", "18.04"), sep = "\n")')
+          done < <(Rscript -e 'cat(remotes::system_requirements("ubuntu", "20.04"), sep = "\n")')
 
       - name: Render the markdown and confirm that the site can be built
         run: make site
-- 
2.30.2