From bf3cef98d366d31073a50306acb8b0ca6c0b52c9 Mon Sep 17 00:00:00 2001
From: Andreas Abel <andreas.abel@ifi.lmu.de>
Date: Fri, 3 May 2024 20:21:17 +0200
Subject: [PATCH 1/3] Bump Haskell CI to jammy distribution

---
 .github/workflows/haskell-ci.yml | 14 +++++++-------
 cabal.haskell-ci                 |  2 +-
 text-icu.cabal                   |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
index 3440e3a..40a3df1 100644
--- a/.github/workflows/haskell-ci.yml
+++ b/.github/workflows/haskell-ci.yml
@@ -8,9 +8,9 @@
 #
 # For more information, see https://github.com/andreasabel/haskell-ci
 #
-# version: 0.19.20240403
+# version: 0.19.20240429
 #
-# REGENDATA ("0.19.20240403",["github","text-icu.cabal"])
+# REGENDATA ("0.19.20240429",["github","text-icu.cabal"])
 #
 name: Haskell-CI
 on:
@@ -27,14 +27,14 @@ jobs:
     timeout-minutes:
       60
     container:
-      image: buildpack-deps:focal
+      image: buildpack-deps:jammy
     continue-on-error: ${{ matrix.allow-failure }}
     strategy:
       matrix:
         include:
-          - compiler: ghc-9.10.0.20240328
+          - compiler: ghc-9.10.0.20240426
             compilerKind: ghc
-            compilerVersion: 9.10.0.20240328
+            compilerVersion: 9.10.0.20240426
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.8.2
@@ -42,9 +42,9 @@ jobs:
             compilerVersion: 9.8.2
             setup-method: ghcup
             allow-failure: false
-          - compiler: ghc-9.6.4
+          - compiler: ghc-9.6.5
             compilerKind: ghc
-            compilerVersion: 9.6.4
+            compilerVersion: 9.6.5
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.4.8
diff --git a/cabal.haskell-ci b/cabal.haskell-ci
index fd352d0..50deda9 100644
--- a/cabal.haskell-ci
+++ b/cabal.haskell-ci
@@ -3,7 +3,7 @@
 branches: master
 
 -- text-icu-0.8 requires a newer ICU lib (shipped not with Ubuntu 18.04, but with 20.04)
-distribution: focal
+-- distribution: focal
 
 -- installed: +all -binary -bytestring -containers -deepseq -directory -time -unix
 
diff --git a/text-icu.cabal b/text-icu.cabal
index f941edc..8da24a9 100644
--- a/text-icu.cabal
+++ b/text-icu.cabal
@@ -57,7 +57,7 @@ extra-source-files:
 tested-with:
   GHC == 9.10.0
   GHC == 9.8.2
-  GHC == 9.6.4
+  GHC == 9.6.5
   GHC == 9.4.8
   GHC == 9.2.8
   GHC == 9.0.2

From 3b3476278c4e2d7429180d7c55b87be33c2093f5 Mon Sep 17 00:00:00 2001
From: Andreas Abel <andreas.abel@ifi.lmu.de>
Date: Fri, 3 May 2024 20:21:37 +0200
Subject: [PATCH 2/3] CI mac: drop GHC 9.0 (not supported by macos-latest)

---
 .github/workflows/cabal-mac-win.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/cabal-mac-win.yml b/.github/workflows/cabal-mac-win.yml
index c8eb348..9f66b94 100644
--- a/.github/workflows/cabal-mac-win.yml
+++ b/.github/workflows/cabal-mac-win.yml
@@ -3,11 +3,9 @@ on:
   push:
     branches:
     - master
-    - ci-*
   pull_request:
     branches:
     - master
-    - ci-*
 
 jobs:
 
@@ -18,10 +16,10 @@ jobs:
       matrix:
         os: [macOS-latest, windows-latest]
         ghc:
-          - 9.0.2
           - 9.2.8
-          - 9.4.7
-          - 9.6.2
+          - 9.4.8
+          - 9.6.5
+          - 9.8.2
       fail-fast: false
 
     steps:

From 7e3c61d6ce04ae42e2d632d09bc321cf79de4088 Mon Sep 17 00:00:00 2001
From: Andreas Abel <andreas.abel@ifi.lmu.de>
Date: Fri, 3 May 2024 20:28:28 +0200
Subject: [PATCH 3/3] CI: stack no longer preinstalled on macos-latest

---
 .github/workflows/stack.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/stack.yml b/.github/workflows/stack.yml
index abc3c9e..b6df1ad 100644
--- a/.github/workflows/stack.yml
+++ b/.github/workflows/stack.yml
@@ -17,7 +17,7 @@ defaults:
 
 jobs:
   stack:
-    name: ${{ matrix.os }} Stack ${{ matrix.plan.resolver }} / ${{ matrix.plan.ghc }}
+    name: ${{ matrix.os }} Stack ${{ matrix.plan.resolver }}
     strategy:
       fail-fast: false
       matrix:
@@ -33,6 +33,11 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
+    - uses: haskell-actions/setup@v2
+      with:
+        enable-stack: true
+        stack-no-global: true
+
     - name: Configure
       run: |
         $STACK init
@@ -53,7 +58,7 @@ jobs:
       # echo "STACK_ROOT=${STACK_ROOT}" >> "${GITHUB_ENV}"
 
     - name: Set up for the ICU library (macOS)
-      if: ${{ runner.os == 'macOS' }}
+      if: runner.os == 'macOS'
       run: |
         ICU4C=$(brew --prefix)/opt/icu4c
         echo "PKG_CONFIG_PATH=${ICU4C}/lib/pkgconfig" >> "${GITHUB_ENV}"