From 337aa086397c20a6c588ecbe96a72f6771b19f22 Mon Sep 17 00:00:00 2001 From: John Blischak Date: Mon, 11 Nov 2024 11:34:24 -0500 Subject: [PATCH] Update operating system for weekly tests current: Ubuntu 20 -> 22 future: Ubuntu 22 -> 24 https://releases.ubuntu.com/noble/ https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md Motivation: "current" is failing because latest git2r 0.35.0 requires libgit2 >=1 https://github.com/workflowr/workflowr-pkg-tests/actions/runs/11775691905/job/32796616477#step:7:542 configure: error: package dependency requirement 'libgit2 >= 1.0' could not be satisfied. --- .github/workflows/current.yaml | 6 +++--- .github/workflows/future.yaml | 5 +++-- .github/workflows/legacy.yaml | 1 + README.md | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/current.yaml b/.github/workflows/current.yaml index 56cc285..f9a9a3c 100644 --- a/.github/workflows/current.yaml +++ b/.github/workflows/current.yaml @@ -5,10 +5,10 @@ on: workflow_dispatch: jobs: current: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 name: current env: - RSPM: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest" + RSPM: "https://packagemanager.rstudio.com/cran/__linux__/jammy/latest" GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v4 @@ -17,7 +17,6 @@ jobs: - name: Install system dependencies run: | sudo apt-get install -y software-properties-common - sudo add-apt-repository -y ppa:cran/libgit2 sudo apt-get update sudo apt-get install -y \ libcurl4-openssl-dev \ @@ -32,6 +31,7 @@ jobs: python3-matplotlib \ qpdf \ zlib1g-dev + apt list - uses: r-lib/actions/setup-pandoc@v2 with: pandoc-version: "2.16.2" diff --git a/.github/workflows/future.yaml b/.github/workflows/future.yaml index 3e40389..5a20f43 100644 --- a/.github/workflows/future.yaml +++ b/.github/workflows/future.yaml @@ -5,10 +5,10 @@ on: workflow_dispatch: jobs: future: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 name: future env: - RSPM: "https://packagemanager.rstudio.com/cran/__linux__/jammy/latest" + RSPM: "https://packagemanager.rstudio.com/cran/__linux__/noble/latest" GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v4 @@ -31,6 +31,7 @@ jobs: python3-matplotlib \ qpdf \ zlib1g-dev + apt list - uses: r-lib/actions/setup-pandoc@v2 with: pandoc-version: "2.19.2" diff --git a/.github/workflows/legacy.yaml b/.github/workflows/legacy.yaml index fb49f28..7d3625c 100644 --- a/.github/workflows/legacy.yaml +++ b/.github/workflows/legacy.yaml @@ -39,6 +39,7 @@ jobs: python3-matplotlib \ qpdf \ zlib1g-dev + apt list - uses: r-lib/actions/setup-r@v2 id: install-r with: diff --git a/README.md b/README.md index 6064efa..efe31aa 100644 --- a/README.md +++ b/README.md @@ -18,9 +18,9 @@ from GitHub Name | OS | R | pandoc | knitr | rmarkdown | status ------- | ------------ | ------- | -------- | ------- | --------- | ------ -current | Ubuntu 20.04 | release | 2.16.2 | release | release | [![current](https://github.com/workflowr/workflowr-pkg-tests/workflows/current/badge.svg)](https://github.com/workflowr/workflowr-pkg-tests/actions/workflows/current.yaml) +current | Ubuntu 22.04 | release | 2.16.2 | release | release | [![current](https://github.com/workflowr/workflowr-pkg-tests/workflows/current/badge.svg)](https://github.com/workflowr/workflowr-pkg-tests/actions/workflows/current.yaml) legacy | Ubuntu 20.04 | 3.3.3 | 1.19.2.4 | 1.29 | 1.18 | [![legacy](https://github.com/workflowr/workflowr-pkg-tests/workflows/legacy/badge.svg)](https://github.com/workflowr/workflowr-pkg-tests/actions/workflows/legacy.yaml) -future | Ubuntu 22.04 | devel | 2.19.2 | devel | devel | [![future](https://github.com/workflowr/workflowr-pkg-tests/workflows/future/badge.svg)](https://github.com/workflowr/workflowr-pkg-tests/actions/workflows/future.yaml) +future | Ubuntu 24.04 | devel | 2.19.2 | devel | devel | [![future](https://github.com/workflowr/workflowr-pkg-tests/workflows/future/badge.svg)](https://github.com/workflowr/workflowr-pkg-tests/actions/workflows/future.yaml) ## Monthly