From 13c6d02e12783b027f4bfc50ea7711e032940949 Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Sun, 16 Feb 2025 18:28:32 +0200 Subject: [PATCH] Switch GHA runner to ubuntu-24.04 Resolves #769 Note: maybe we could use ubuntu-latest, but OTOH doing an update once in 3-4 years is not a big trouble. --- .github/workflows/haskell-ci.yml | 2 +- Makefile | 2 +- fixtures/all-versions.github | 2 +- fixtures/copy-fields-all.github | 2 +- fixtures/copy-fields-none.github | 2 +- fixtures/copy-fields-some.github | 2 +- fixtures/doctest-version.github | 2 +- fixtures/doctest.github | 2 +- fixtures/empty-line.github | 2 +- fixtures/enabled-jobs.github | 2 +- fixtures/fail-versions.github | 2 +- fixtures/irc-channels.github | 4 ++-- fixtures/messy.github | 2 +- fixtures/psql.github | 2 +- fixtures/travis-patch.github | 2 +- haskell-ci.cabal | 2 +- src/HaskellCI/GitHub.hs | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index cec7971d..5120246f 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -21,7 +21,7 @@ on: jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 60 container: diff --git a/Makefile b/Makefile index 28af422a..aa0539c6 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -HC ?= ghc-9.8.2 +HC ?= ghc-9.8.4 build : cabal v2-build -w $(HC) diff --git a/fixtures/all-versions.github b/fixtures/all-versions.github index 3c234915..3fd119e7 100644 --- a/fixtures/all-versions.github +++ b/fixtures/all-versions.github @@ -19,7 +19,7 @@ on: jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 60 container: diff --git a/fixtures/copy-fields-all.github b/fixtures/copy-fields-all.github index 4492207a..229f8f44 100644 --- a/fixtures/copy-fields-all.github +++ b/fixtures/copy-fields-all.github @@ -19,7 +19,7 @@ on: jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 60 container: diff --git a/fixtures/copy-fields-none.github b/fixtures/copy-fields-none.github index ee6bc293..bc03d9af 100644 --- a/fixtures/copy-fields-none.github +++ b/fixtures/copy-fields-none.github @@ -19,7 +19,7 @@ on: jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 60 container: diff --git a/fixtures/copy-fields-some.github b/fixtures/copy-fields-some.github index 389b4438..ff8412a3 100644 --- a/fixtures/copy-fields-some.github +++ b/fixtures/copy-fields-some.github @@ -19,7 +19,7 @@ on: jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 60 container: diff --git a/fixtures/doctest-version.github b/fixtures/doctest-version.github index d897e756..e663df98 100644 --- a/fixtures/doctest-version.github +++ b/fixtures/doctest-version.github @@ -19,7 +19,7 @@ on: jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 60 container: diff --git a/fixtures/doctest.github b/fixtures/doctest.github index dcfd1f60..d8d1198b 100644 --- a/fixtures/doctest.github +++ b/fixtures/doctest.github @@ -19,7 +19,7 @@ on: jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 60 container: diff --git a/fixtures/empty-line.github b/fixtures/empty-line.github index eb04d78b..382c48c1 100644 --- a/fixtures/empty-line.github +++ b/fixtures/empty-line.github @@ -19,7 +19,7 @@ on: jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 60 container: diff --git a/fixtures/enabled-jobs.github b/fixtures/enabled-jobs.github index e59e6272..d34ff14c 100644 --- a/fixtures/enabled-jobs.github +++ b/fixtures/enabled-jobs.github @@ -19,7 +19,7 @@ on: jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 60 container: diff --git a/fixtures/fail-versions.github b/fixtures/fail-versions.github index f25586a7..80e52687 100644 --- a/fixtures/fail-versions.github +++ b/fixtures/fail-versions.github @@ -19,7 +19,7 @@ on: jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 60 container: diff --git a/fixtures/irc-channels.github b/fixtures/irc-channels.github index 3845f126..6396fb40 100644 --- a/fixtures/irc-channels.github +++ b/fixtures/irc-channels.github @@ -19,7 +19,7 @@ on: jobs: irc: name: Haskell-CI (IRC notification) - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 needs: - linux if: ${{ always() }} @@ -46,7 +46,7 @@ jobs: server: irc.libera.chat linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 60 container: diff --git a/fixtures/messy.github b/fixtures/messy.github index 5184eafb..c4250902 100644 --- a/fixtures/messy.github +++ b/fixtures/messy.github @@ -19,7 +19,7 @@ on: jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 60 container: diff --git a/fixtures/psql.github b/fixtures/psql.github index 58b7e938..99bc92a5 100644 --- a/fixtures/psql.github +++ b/fixtures/psql.github @@ -19,7 +19,7 @@ on: jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 60 container: diff --git a/fixtures/travis-patch.github b/fixtures/travis-patch.github index e5f0845f..5fff61d6 100644 --- a/fixtures/travis-patch.github +++ b/fixtures/travis-patch.github @@ -19,7 +19,7 @@ on: jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 60 container: diff --git a/haskell-ci.cabal b/haskell-ci.cabal index 356ed8a7..259ff8e9 100644 --- a/haskell-ci.cabal +++ b/haskell-ci.cabal @@ -1,6 +1,6 @@ cabal-version: 2.2 name: haskell-ci -version: 0.19.20250115 +version: 0.19.20250216 synopsis: Haskell CI script generator description: Script generator (@haskell-ci@) for diff --git a/src/HaskellCI/GitHub.hs b/src/HaskellCI/GitHub.hs index c58bfada..d67aef74 100644 --- a/src/HaskellCI/GitHub.hs +++ b/src/HaskellCI/GitHub.hs @@ -781,7 +781,7 @@ parseGitHubRepo t = -- date to ensure that it runs on a version of Ubuntu that GitHub Actions -- runners support. ghcRunsOnVer :: String -ghcRunsOnVer = "ubuntu-20.04" +ghcRunsOnVer = "ubuntu-24.04" translateCompilerVersion :: Map Version Version -> CompilerVersion -> CompilerVersion translateCompilerVersion m (GHC v) = GHC (Map.findWithDefault v v m)