From fe3fa2694087d6b12d3eb188f64fac692e29a59d Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Tue, 18 Nov 2025 08:02:11 -1000
Subject: [PATCH] ;ci: force use of and upgrade to shelltestrunner 1.11, 2

---
 .github/workflows/binaries-mac-arm64.yml | 3 ++-
 .github/workflows/binaries-mac-x64.yml   | 3 ++-
 .github/workflows/ci.yml                 | 3 ++-
 .github/workflows/oldest.yml             | 5 +++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/binaries-mac-arm64.yml b/.github/workflows/binaries-mac-arm64.yml
index 4c5b16363..dbbcaa65d 100644
--- a/.github/workflows/binaries-mac-arm64.yml
+++ b/.github/workflows/binaries-mac-arm64.yml
@@ -124,7 +124,8 @@ jobs:
     - name: Install shelltestrunner
       run: |
         export PATH=~/.local/bin:$PATH
-        if [[ ! -x ~/.local/bin/shelltest || true ]]; then $stack install --verbosity=error shelltestrunner-1.11; fi
+        $stack update;                             $stack install --verbosity=error shelltestrunner-1.11
+        if [[ ! -x ~/.local/bin/shelltest ]]; then $stack install --verbosity=error shelltestrunner-1.11; fi
         shelltest --version
 
     - name: Test functional tests (excluding addons)
diff --git a/.github/workflows/binaries-mac-x64.yml b/.github/workflows/binaries-mac-x64.yml
index 9c67d4531..a640706b4 100644
--- a/.github/workflows/binaries-mac-x64.yml
+++ b/.github/workflows/binaries-mac-x64.yml
@@ -125,7 +125,8 @@ jobs:
     - name: Install shelltestrunner
       run: |
         export PATH=~/.local/bin:$PATH
-        if [[ ! -x ~/.local/bin/shelltest || true ]]; then $stack install --verbosity=error shelltestrunner-1.11; fi
+        $stack update;                             $stack install --verbosity=error shelltestrunner-1.11
+        if [[ ! -x ~/.local/bin/shelltest ]]; then $stack install --verbosity=error shelltestrunner-1.11; fi
         shelltest --version
 
     - name: Test functional tests (excluding addons)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 33608511f..e0fa8ffd5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -328,7 +328,8 @@ jobs:
     - name: Install shelltestrunner
       run: |
         export PATH=~/.local/bin:$PATH
-        if [[ ! -x ~/.local/bin/shelltest || true ]]; then $stack install --verbosity=error shelltestrunner-1.11; fi
+        $stack update;                             $stack install --verbosity=error shelltestrunner-1.11
+        if [[ ! -x ~/.local/bin/shelltest ]]; then $stack install --verbosity=error shelltestrunner-1.11; fi
         shelltest --version
       if: env.do-all
 
diff --git a/.github/workflows/oldest.yml b/.github/workflows/oldest.yml
index 4afe1bc22..7d61a2def 100644
--- a/.github/workflows/oldest.yml
+++ b/.github/workflows/oldest.yml
@@ -136,14 +136,15 @@ jobs:
       run: |
         $stack install --test --bench hledger-web --fast --ghc-options=-Werror
 
-    # XXX disable until this is fixed: shelltestrunner-1.11/src/shelltest.hs:125:20: error:
+    # XXX disable until this is fixed: shelltest.hs:125:20: error:
     # shelltestrunner      >     Not in scope: ‘configFailFast’
     # shelltestrunner      >     Perhaps you meant ‘configFastFail’ (imported from Test.Hspec.Core.Runner)
 
     # - name: Install shelltestrunner
     #   run: |
     #     export PATH=~/.local/bin:$PATH
-    #     if [[ ! -x ~/.local/bin/shelltest || true ]]; then $stack install --verbosity=error shelltestrunner-1.11; fi
+    #     $stack update;                             $stack install --verbosity=error shelltestrunner-1.11
+    #     if [[ ! -x ~/.local/bin/shelltest ]]; then $stack install --verbosity=error shelltestrunner-1.11; fi
     #     shelltest --version
 
     # - name: Test functional tests (excluding addons)