Skip to content

Commit 831645f

Browse files
try to simplify things
1 parent aa652ad commit 831645f

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ jobs:
4646
key: ${{ matrix.os }}-${{ matrix.ghc-version }}-${{ github.sha }}
4747
path: ~/.cabal/store
4848

49-
5049
test-with-stack:
5150
name: Stack
5251
runs-on: ${{ matrix.os }}
@@ -67,7 +66,7 @@ jobs:
6766
with:
6867
ghc-version: ${{ matrix.ghc }}
6968
enable-stack: true
70-
stack-version: ${{ matrix.stack || 'latest' }}
69+
stack-version: latest
7170

7271
- name: Cache
7372
id: cache
@@ -79,15 +78,12 @@ jobs:
7978
key: ${{ runner.os }}-${{ matrix.resolver }}-${{ github.sha }}
8079
restore-keys: |
8180
${{ runner.os }}-${{ matrix.resolver }}
82-
- name: Reset modtime
83-
run: |
84-
set -ex
85-
curl -sSL https://raw.githubusercontent.com/lehins/utils/master/haskell/git-modtime/git-modtime.hs -o git-modtime.hs
86-
runhaskell -- git-modtime.hs -f .stack-work-root/tree-contents.txt
81+
8782
- name: Build
8883
run: |
8984
set -ex
9085
stack $STACK_ARGS test --no-run-tests --bench --no-run-benchmarks --haddock --no-haddock-deps
86+
9187
- name: Test
9288
env:
9389
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
@@ -96,8 +92,10 @@ jobs:
9692
if [ "${{ matrix.os }}.${{ matrix.resolver }}" == "ubuntu-latest.lts-24" ] && [ -n "${COVERALLS_REPO_TOKEN}" ]; then
9793
stack $STACK_ARGS test --coverage
9894
stack $STACK_ARGS hpc report --all
99-
curl -L https://github.com/rubik/stack-hpc-coveralls/releases/download/v0.0.7.0/shc-Linux-X64.tar.bz2 | tar xj shc
100-
./shc --repo-token="$COVERALLS_REPO_TOKEN" --partial-coverage --fetch-coverage combined all
95+
# curl -L https://github.com/rubik/stack-hpc-coveralls/releases/download/v0.0.7.0/shc-Linux-X64.tar.bz2 | tar xj shc
96+
# ./shc --repo-token="$COVERALLS_REPO_TOKEN" --partial-coverage --fetch-coverage combined all
97+
stack $STACK_ARGS install stack-hpc-coveralls
98+
shc --repo-token="$COVERALLS_REPO_TOKEN" --partial-coverage --fetch-coverage combined all
10199
else
102100
stack $STACK_ARGS test
103101
fi

0 commit comments

Comments
 (0)