From 70389f576419a0f4b0a46aa946bd300f8468aff3 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Thu, 16 May 2024 08:26:23 -1000
Subject: [PATCH] ci: update default CI tests to ubuntu 2404 / preinstalled
 ghc/stack

---
 .github/workflows/ci.yml | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 40a877c1c..69a8cd697 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,12 +43,19 @@ on:
     #   - '!**.txt'
 jobs:
   citest:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     env:
-      ghc:   944
-      stack: stack --stack-yaml=stack9.4.yaml
-      # declare this to prevent "Context access might be invalid" warnings below
+      # This workflow uses github's preinstalled ghc & stack on ubuntu.
+      # Keep these synced with the latest ghc version athttps://github.com/actions/runner-images/blob/ubuntu22/20240514.2/images/ubuntu/Ubuntu2404-Readme.md#haskell-tools
+      #
+      # caching id for this ghc's build artifacts:
+      ghc: 982
+      # stack config for this ghc:
+      stack: stack --system-ghc
+
+      # flag for skipping later steps, declared here to prevent "Context access might be invalid" warnings
       do-all:
+
     steps:
 
     - name: Check out
@@ -190,19 +197,19 @@ jobs:
 
     # actions:
 
-    - name: Install stack
+    - name: Set up stack
       run: |
-        mkdir -p ~/.local/bin
-        export PATH=~/.local/bin:$PATH
+        # mkdir -p ~/.local/bin
+        # export PATH=~/.local/bin:$PATH
         # curl -sL https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'; chmod a+x ~/.local/bin/stack
-        if [[ ! -x ~/.local/bin/stack ]]; then curl -sL https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'; chmod a+x ~/.local/bin/stack; fi
+        # if [[ ! -x ~/.local/bin/stack ]]; then curl -sL https://get.haskellstack.org/stable/linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'; chmod a+x ~/.local/bin/stack; fi
         stack --version
       if: env.do-all
 
-    - name: Install GHC
-      run: |
-        $stack setup --install-ghc
-      if: env.do-all
+    # - name: Install GHC
+    #   run: |
+    #     $stack setup --install-ghc
+    #   if: env.do-all
 
     - name: Install haskell deps
       run: |