From bf5f5da44a014cd16d94cbbf30241d7df325c042 Mon Sep 17 00:00:00 2001
From: Matthew Craven <clyring@gmail.com>
Date: Thu, 16 Nov 2023 18:10:07 -0500
Subject: [PATCH] Attempt to fix CI again (#626)

The windows jobs were subtly broken by #613, which caused
the build products to live in bytestring-*/dist-newstyle
instead of dist-newstyle.  This didn't appear to break
immediately because we restored cached stuff in dist-newstyle
including stale executables.  It wasn't until a week of
inactivity caused our cache to expire that the breakage
became appropriately obvious.

I don't really understand what went wrong with the centos job;
I just borrowed the workaround from haskell/text#541.
---
 .github/workflows/ci.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6c3086495..c622b3fda 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,6 +4,7 @@ on:
     branches:
       - master
       - bytestring-0.11
+      - bytestring-0.12
   pull_request: {} # Validate all PRs
 
 defaults:
@@ -17,7 +18,7 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest]
-        ghc: ['8.0', '8.2', '8.4', '8.6', '8.8', '8.10', '9.0', '9.2', '9.4', '9.6']
+        ghc: ['8.0', '8.2', '8.4', '8.6', '8.8', '8.10', '9.0', '9.2', '9.4', '9.6', '9.8']
         include:
         - os: macOS-latest
           ghc: 'latest'
@@ -33,7 +34,7 @@ jobs:
         ghc-version: ${{ matrix.ghc }}
     - name: Update cabal package database
       run: cabal update
-    - uses: actions/cache@v2
+    - uses: actions/cache@v3
       name: Cache cabal stuff
       with:
         path: |
@@ -75,7 +76,7 @@ jobs:
         ghc-version: ${{ matrix.ghc }}
     - name: Update cabal package database
       run: cabal update
-    - uses: actions/cache@v2
+    - uses: actions/cache@v3
       name: Cache cabal stuff
       with:
         path: |
@@ -97,6 +98,7 @@ jobs:
     - name: Run Test
       # test broken linking on windows: https://github.com/haskell/bytestring/issues/497
       run: |
+        cd bytestring-*/
         $bin = cabal list-bin bytestring-tests
         $env:PATH = ''
         & "$bin"
@@ -155,7 +157,7 @@ jobs:
         ghc-version: 'latest'
     - name: Update cabal package database
       run: cabal update
-    - uses: actions/cache@v2
+    - uses: actions/cache@v3
       name: Cache cabal stuff
       with:
         path: |
@@ -174,7 +176,7 @@ jobs:
     - name: install deps
       run: |
           yum install -y gcc gmp gmp-devel make ncurses ncurses-compat-libs xz perl
-          curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 sh
+          curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 BOOTSTRAP_HASKELL_GHC_VERSION=9.2.8 sh
     - uses: actions/checkout@v3
     - name: test
       run: |