Skip to content

Commit fe3fa26

Browse files
committed
;ci: force use of and upgrade to shelltestrunner 1.11, 2
1 parent 6f9a8d2 commit fe3fa26

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

.github/workflows/binaries-mac-arm64.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ jobs:
124124
- name: Install shelltestrunner
125125
run: |
126126
export PATH=~/.local/bin:$PATH
127-
if [[ ! -x ~/.local/bin/shelltest || true ]]; then $stack install --verbosity=error shelltestrunner-1.11; fi
127+
$stack update; $stack install --verbosity=error shelltestrunner-1.11
128+
if [[ ! -x ~/.local/bin/shelltest ]]; then $stack install --verbosity=error shelltestrunner-1.11; fi
128129
shelltest --version
129130
130131
- name: Test functional tests (excluding addons)

.github/workflows/binaries-mac-x64.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@ jobs:
125125
- name: Install shelltestrunner
126126
run: |
127127
export PATH=~/.local/bin:$PATH
128-
if [[ ! -x ~/.local/bin/shelltest || true ]]; then $stack install --verbosity=error shelltestrunner-1.11; fi
128+
$stack update; $stack install --verbosity=error shelltestrunner-1.11
129+
if [[ ! -x ~/.local/bin/shelltest ]]; then $stack install --verbosity=error shelltestrunner-1.11; fi
129130
shelltest --version
130131
131132
- name: Test functional tests (excluding addons)

.github/workflows/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,8 @@ jobs:
328328
- name: Install shelltestrunner
329329
run: |
330330
export PATH=~/.local/bin:$PATH
331-
if [[ ! -x ~/.local/bin/shelltest || true ]]; then $stack install --verbosity=error shelltestrunner-1.11; fi
331+
$stack update; $stack install --verbosity=error shelltestrunner-1.11
332+
if [[ ! -x ~/.local/bin/shelltest ]]; then $stack install --verbosity=error shelltestrunner-1.11; fi
332333
shelltest --version
333334
if: env.do-all
334335

.github/workflows/oldest.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,14 +136,15 @@ jobs:
136136
run: |
137137
$stack install --test --bench hledger-web --fast --ghc-options=-Werror
138138
139-
# XXX disable until this is fixed: shelltestrunner-1.11/src/shelltest.hs:125:20: error:
139+
# XXX disable until this is fixed: shelltest.hs:125:20: error:
140140
# shelltestrunner > Not in scope: ‘configFailFast’
141141
# shelltestrunner > Perhaps you meant ‘configFastFail’ (imported from Test.Hspec.Core.Runner)
142142

143143
# - name: Install shelltestrunner
144144
# run: |
145145
# export PATH=~/.local/bin:$PATH
146-
# if [[ ! -x ~/.local/bin/shelltest || true ]]; then $stack install --verbosity=error shelltestrunner-1.11; fi
146+
# $stack update; $stack install --verbosity=error shelltestrunner-1.11
147+
# if [[ ! -x ~/.local/bin/shelltest ]]; then $stack install --verbosity=error shelltestrunner-1.11; fi
147148
# shelltest --version
148149

149150
# - name: Test functional tests (excluding addons)

0 commit comments

Comments
 (0)