Merge pull request #770 from haskell-CI/runner-image-2404

phadej · web-flow · commit 41d6548a0d55 · 2025-02-17T11:36:26.000+02:00
Switch GHA runner to ubuntu-24.04
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ on:`
`21`	`21`	`jobs:`
`22`	`22`	`linux:`
`23`	`23`	`name: Haskell-CI - Linux - ${{ matrix.compiler }}`
`24`		`- runs-on: ubuntu-20.04`
	`24`	`+ runs-on: ubuntu-24.04`
`25`	`25`	`timeout-minutes:`
`26`	`26`	`60`
`27`	`27`	`container:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-HC ?= ghc-9.8.2`
	`1`	`+HC ?= ghc-9.8.4`
`2`	`2`
`3`	`3`	`build :`
`4`	`4`	`cabal v2-build -w $(HC)`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ on:`
`19`	`19`	`jobs:`
`20`	`20`	`linux:`
`21`	`21`	`name: Haskell-CI - Linux - ${{ matrix.compiler }}`
`22`		`- runs-on: ubuntu-20.04`
	`22`	`+ runs-on: ubuntu-24.04`
`23`	`23`	`timeout-minutes:`
`24`	`24`	`60`
`25`	`25`	`container:`