Merge f153242 into 4075099

r-lib · Aug 22, 2022 · 9311fe2 · 9311fe2
2 parents 4075099 + f153242
commit 9311fe2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.github/workflows/check-full.yaml b/.github/workflows/check-full.yaml
@@ -27,12 +27,12 @@ jobs:
           - {os: windows-latest, r: '3.6'}
 
           # Use older ubuntu to maximise backward compatibility
-          - {os: ubuntu-18.04,   r: 'devel', http-user-agent: 'release'}
-          - {os: ubuntu-18.04,   r: 'release'}
-          - {os: ubuntu-18.04,   r: 'oldrel-1'}
-          - {os: ubuntu-18.04,   r: 'oldrel-2'}
-          - {os: ubuntu-18.04,   r: 'oldrel-3'}
-          - {os: ubuntu-18.04,   r: 'oldrel-4'}
+          - {os: ubuntu-latest,  r: 'devel', http-user-agent: 'release'}
+          - {os: ubuntu-latest,  r: 'release'}
+          - {os: ubuntu-latest,  r: 'oldrel-1'}
+          - {os: ubuntu-latest,  r: 'oldrel-2'}
+          - {os: ubuntu-latest,  r: 'oldrel-3'}
+          - {os: ubuntu-latest,  r: 'oldrel-4'}
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/pre-commit.yaml b/.github/workflows/pre-commit.yaml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   pre-commit:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     if: >-
       !contains(github.event.head_commit.message, 'ci skip') &&
       (

diff --git a/cran-comments.md b/cran-comments.md
@@ -10,7 +10,7 @@ Luke Tierney.
 
 ## Test environments
 
--   ubuntu 18.04 (on GitHub Actions): R devel, R 4.1.2, R 4.0.5, R 3.6, R 3.5,
+-   ubuntu 20.04 (on GitHub Actions): R devel, R 4.1.2, R 4.0.5, R 3.6, R 3.5,
     R 3.4
 -   Windows Server 10 (on GitHub Actions): R 3.6, R 4.0.5
 -   win-builder: R devel

diff --git a/touchstone/config.json b/touchstone/config.json
@@ -1,5 +1,5 @@
 {
-  "os": "ubuntu-20.04",
+  "os": "ubuntu-latest",
   "r": "4.2",
   "rspm": "https://packagemanager.rstudio.com/all/__linux__/focal/2022-08-01",
   "benchmarking_repo": "lorenzwalthert/here",