From 1efe16beb727338c37688a676a202c6449dc9da7 Mon Sep 17 00:00:00 2001
From: Andreas Abel <andreas.abel@ifi.lmu.de>
Date: Sat, 27 Jan 2024 19:34:22 +0100
Subject: [PATCH] CI: bump GHC 9.6 to 9.6.4 and actions/cache to v4

Also drop special runs on ci-* and release-* branches.
Always go through PRs.
---
 .github/workflows/fix-whitespace.yml    |  2 +-
 .github/workflows/haskell-ci-simple.yml | 11 ++++-------
 .github/workflows/haskell-ci.yml        | 16 ++++++----------
 alex.cabal                              |  2 +-
 cabal.haskell-ci                        |  2 +-
 5 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/fix-whitespace.yml b/.github/workflows/fix-whitespace.yml
index bfe6fbcf..3591b123 100644
--- a/.github/workflows/fix-whitespace.yml
+++ b/.github/workflows/fix-whitespace.yml
@@ -9,7 +9,7 @@ jobs:
 
     steps:
     - name: Checkout sources
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Check for whitespace violations
       uses: andreasabel/fix-whitespace-action@v1
diff --git a/.github/workflows/haskell-ci-simple.yml b/.github/workflows/haskell-ci-simple.yml
index 8eb1f450..eafbda44 100644
--- a/.github/workflows/haskell-ci-simple.yml
+++ b/.github/workflows/haskell-ci-simple.yml
@@ -3,13 +3,9 @@ on:
   push:
     branches:
       - master
-      - ci-*
-      - release-*
   pull_request:
     branches:
       - master
-      - ci-*
-      - release-*
 
 defaults:
   run:
@@ -34,7 +30,7 @@ jobs:
           # - "9.0.2"
           # - "9.2.8"
           - "9.4.8"
-          - "9.6.3"
+          - "9.6.4"
           - "9.8.1"
         include:
           - ghc: "9.8.1"
@@ -52,7 +48,7 @@ jobs:
         cabal-version: "latest"
         cabal-update: true
 
-    - uses: actions/cache@v3
+    - uses: actions/cache@v4
       name: Cache cabal stuff
       with:
         path: |
@@ -84,7 +80,8 @@ jobs:
     - name: Test
       run: |
         cd alex-*/
-        export ALEX=$(cabal list-bin alex)
+        ALEX="$(cabal list-bin alex)"
+        export ALEX
         cabal run --enable-tests alex:test:tests
 
     - name: Haddock
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
index 58c048c9..acfe4f9f 100644
--- a/.github/workflows/haskell-ci.yml
+++ b/.github/workflows/haskell-ci.yml
@@ -8,22 +8,18 @@
 #
 # For more information, see https://github.com/andreasabel/haskell-ci
 #
-# version: 0.17.20231112
+# version: 0.17.20240127
 #
-# REGENDATA ("0.17.20231112",["github","alex.cabal"])
+# REGENDATA ("0.17.20240127",["github","alex.cabal"])
 #
 name: Haskell-CI
 on:
   push:
     branches:
       - master
-      - ci-*
-      - release-*
   pull_request:
     branches:
       - master
-      - ci-*
-      - release-*
 jobs:
   linux:
     name: Haskell-CI - Linux - ${{ matrix.compiler }}
@@ -41,9 +37,9 @@ jobs:
             compilerVersion: 9.8.1
             setup-method: ghcup
             allow-failure: false
-          - compiler: ghc-9.6.3
+          - compiler: ghc-9.6.4
             compilerKind: ghc
-            compilerVersion: 9.6.3
+            compilerVersion: 9.6.4
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.4.8
@@ -225,7 +221,7 @@ jobs:
           $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
           cabal-plan
       - name: restore cache
-        uses: actions/cache/restore@v3
+        uses: actions/cache/restore@v4
         with:
           key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
           path: ~/.cabal/store
@@ -261,7 +257,7 @@ jobs:
           rm -f cabal.project.local
           $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
       - name: save cache
-        uses: actions/cache/save@v3
+        uses: actions/cache/save@v4
         if: always()
         with:
           key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
diff --git a/alex.cabal b/alex.cabal
index ba69acc8..1dd5966c 100644
--- a/alex.cabal
+++ b/alex.cabal
@@ -23,7 +23,7 @@ build-type: Simple
 
 tested-with:
         GHC == 9.8.1
-        GHC == 9.6.3
+        GHC == 9.6.4
         GHC == 9.4.8
         GHC == 9.2.8
         GHC == 9.0.2
diff --git a/cabal.haskell-ci b/cabal.haskell-ci
index caef77aa..5588907f 100644
--- a/cabal.haskell-ci
+++ b/cabal.haskell-ci
@@ -1,4 +1,4 @@
-branches: master ci-* release-*
+branches: master
 
 -- -- For bootstrapping:
 -- apt: alex happy