@@ -123,7 +123,7 @@ jobs:
123
123
- name : cache (tools)
124
124
uses : actions/cache@v2
125
125
with :
126
- key : ${{ runner.os }}-${{ matrix.compiler }}-tools-359ec286
126
+ key : ${{ runner.os }}-${{ matrix.compiler }}-tools-f9d9af4c
127
127
path : ~/.haskell-ci-tools
128
128
- name : install cabal-plan
129
129
run : |
@@ -140,7 +140,7 @@ jobs:
140
140
doctest --version
141
141
- name : install hlint
142
142
run : |
143
- if [ $((HCNUMVER >= 90200)) -ne 0 ] ; then HLINTVER=$(cd /tmp && (${CABAL} v2-install -v $ARG_COMPILER --dry-run hlint --constraint='hlint >=3.3 && <3.5 ' | perl -ne 'if (/\bhlint-(\d+(\.\d+)*)\b/) { print "$1"; last; }')); echo "HLint version $HLINTVER" ; fi
143
+ if [ $((HCNUMVER >= 90200)) -ne 0 ] ; then HLINTVER=$(cd /tmp && (${CABAL} v2-install -v $ARG_COMPILER --dry-run hlint --constraint='hlint >=3.3 && <3.6 ' | perl -ne 'if (/\bhlint-(\d+(\.\d+)*)\b/) { print "$1"; last; }')); echo "HLint version $HLINTVER" ; fi
144
144
if [ $((HCNUMVER >= 90200)) -ne 0 ] ; then if [ ! -e $HOME/.haskell-ci-tools/hlint-$HLINTVER/hlint ]; then echo "Downloading HLint version $HLINTVER"; mkdir -p $HOME/.haskell-ci-tools; curl --write-out 'Status Code: %{http_code} Redirects: %{num_redirects} Total time: %{time_total} Total Dsize: %{size_download}\n' --silent --location --output $HOME/.haskell-ci-tools/hlint-$HLINTVER.tar.gz "https://github.com/ndmitchell/hlint/releases/download/v$HLINTVER/hlint-$HLINTVER-x86_64-linux.tar.gz"; tar -xzv -f $HOME/.haskell-ci-tools/hlint-$HLINTVER.tar.gz -C $HOME/.haskell-ci-tools; fi ; fi
145
145
if [ $((HCNUMVER >= 90200)) -ne 0 ] ; then mkdir -p $CABAL_DIR/bin && ln -sf "$HOME/.haskell-ci-tools/hlint-$HLINTVER/hlint" $CABAL_DIR/bin/hlint ; fi
146
146
if [ $((HCNUMVER >= 90200)) -ne 0 ] ; then hlint --version ; fi
@@ -163,28 +163,17 @@ jobs:
163
163
find sdist -maxdepth 1 -type f -name '*.tar.gz' -exec tar -C $GITHUB_WORKSPACE/unpacked -xzvf {} \;
164
164
- name : generate cabal.project
165
165
run : |
166
- PKGDIR_effectful_typed_process ="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/effectful- typed-process-[0-9.]*')"
167
- echo "PKGDIR_effectful_typed_process =${PKGDIR_effectful_typed_process }" >> "$GITHUB_ENV"
166
+ PKGDIR_typed_process_effectful ="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/typed-process-effectful -[0-9.]*')"
167
+ echo "PKGDIR_typed_process_effectful =${PKGDIR_typed_process_effectful }" >> "$GITHUB_ENV"
168
168
rm -f cabal.project cabal.project.local
169
169
touch cabal.project
170
170
touch cabal.project.local
171
- echo "packages: ${PKGDIR_effectful_typed_process }" >> cabal.project
172
- echo "package effectful- typed-process" >> cabal.project
171
+ echo "packages: ${PKGDIR_typed_process_effectful }" >> cabal.project
172
+ echo "package typed-process-effectful " >> cabal.project
173
173
echo " ghc-options: -Werror=missing-methods" >> cabal.project
174
174
cat >> cabal.project <<EOF
175
- source-repository-package
176
- type: git
177
- location: https://github.com/haskell-effectful/effectful.git
178
- tag: cfd958d
179
- subdir: effectful
180
-
181
- source-repository-package
182
- type: git
183
- location: https://github.com/haskell-effectful/effectful.git
184
- tag: cfd958d
185
- subdir: effectful-core
186
175
EOF
187
- $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(effectful- typed-process)$/; }' >> cabal.project.local
176
+ $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(typed-process-effectful )$/; }' >> cabal.project.local
188
177
cat cabal.project
189
178
cat cabal.project.local
190
179
- name : dump install plan
@@ -212,14 +201,14 @@ jobs:
212
201
$CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct
213
202
- name : doctest
214
203
run : |
215
- cd ${PKGDIR_effectful_typed_process } || false
204
+ cd ${PKGDIR_typed_process_effectful } || false
216
205
doctest -XHaskell2010 -XDataKinds -XFlexibleContexts -XGADTs -XKindSignatures -XTypeOperators src
217
206
- name : hlint
218
207
run : |
219
- if [ $((HCNUMVER >= 90200)) -ne 0 ] ; then (cd ${PKGDIR_effectful_typed_process } && hlint -XHaskell2010 -XDataKinds -XFlexibleContexts -XGADTs -XKindSignatures -XTypeOperators src) ; fi
208
+ if [ $((HCNUMVER >= 90200)) -ne 0 ] ; then (cd ${PKGDIR_typed_process_effectful } && hlint -XHaskell2010 -XDataKinds -XFlexibleContexts -XGADTs -XKindSignatures -XTypeOperators src) ; fi
220
209
- name : cabal check
221
210
run : |
222
- cd ${PKGDIR_effectful_typed_process } || false
211
+ cd ${PKGDIR_typed_process_effectful } || false
223
212
${CABAL} -vnormal check
224
213
- name : haddock
225
214
run : |
0 commit comments