From 5809ffce444c30d3b7332f127f4613534f2d293f Mon Sep 17 00:00:00 2001
From: Pierre Le Marre <dev@wismill.eu>
Date: Fri, 14 Jun 2024 11:04:44 +0200
Subject: [PATCH] ci: Update actions

- Replace deprecated `haskell/actions/setup` with `haskell-actions/setup`
- Bump actions
- Bump macOS
---
 .github/workflows/haskell.yml | 20 ++++++++++----------
 .github/workflows/s390x.yml   |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
index 064d2874..14808529 100644
--- a/.github/workflows/haskell.yml
+++ b/.github/workflows/haskell.yml
@@ -50,11 +50,11 @@ jobs:
           - 8.4.4
           - 8.6.5
           - 8.8.4
-          - 8.8.4+macOS
           - 8.10.7
           - 9.0.2
           - 9.2.8+ucd2haskell
           - 9.4.8
+          - 9.4.8+macOS
           - 9.6.5
           - 9.8.2
           - 9.10.1+ucd2haskell
@@ -95,12 +95,6 @@ jobs:
             cabal_version: 3.2
             ignore_error: false
 
-          - name: 8.8.4+macOS
-            ghc_version: 8.8.4
-            runner: macos-latest
-            cabal_version: 3.2
-            ignore_error: false
-
           - name: 8.10.7
             ghc_version: 8.10.7
             runner: ubuntu-latest
@@ -127,6 +121,12 @@ jobs:
             cabal_version: 3.8.1.0
             ignore_error: false
 
+          - name: 9.4.8+macOS
+            ghc_version: 9.4.8
+            runner: macos-latest
+            cabal_version: latest
+            ignore_error: false
+
           - name: 9.6.5
             ghc_version: 9.6.5
             runner: ubuntu-latest
@@ -170,15 +170,15 @@ jobs:
             ignore_error: false
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
-    - uses: haskell/actions/setup@v2
+    - uses: haskell-actions/setup@v2
       with:
         ghc-version: ${{ matrix.ghc_version }}
         ghcup-release-channel: ${{ matrix.ghcup_release_channel }}
         cabal-version: ${{ matrix.cabal_version }}
 
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       name: Cache ~/.cabal
       with:
         path: ~/.cabal
diff --git a/.github/workflows/s390x.yml b/.github/workflows/s390x.yml
index 663bcef1..f172ce40 100644
--- a/.github/workflows/s390x.yml
+++ b/.github/workflows/s390x.yml
@@ -19,8 +19,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: uraimo/run-on-arch-action@v2.3.0
+    - uses: actions/checkout@v4
+    - uses: uraimo/run-on-arch-action@v2.7.2
       timeout-minutes: 60
       with:
         arch: s390x