Skip to content

Commit 98daca7

Browse files
Update haskell-ci for the new cabal.project
1 parent 94e0615 commit 98daca7

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This GitHub workflow config has been generated by a script via
22
#
3-
# haskell-ci 'github' '--haddock' '--hlint' '--hlint-job' '9.4.5' '--github-patches' '.github/haskell-ci.patch' 'code/hsec-tools/hsec-tools.cabal'
3+
# haskell-ci 'github' '--haddock' '--hlint' '--hlint-job' '9.4.5' '--github-patches' '.github/haskell-ci.patch' 'cabal.project'
44
#
55
# To regenerate the script (for example after adjusting tested-with) run
66
#
@@ -10,7 +10,7 @@
1010
#
1111
# version: 0.16.3
1212
#
13-
# REGENDATA ("0.16.3",["github","--haddock","--hlint","--hlint-job","9.4.5","--github-patches",".github/haskell-ci.patch","code/hsec-tools/hsec-tools.cabal"])
13+
# REGENDATA ("0.16.3",["github","--haddock","--hlint","--hlint-job","9.4.5","--github-patches",".github/haskell-ci.patch","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -175,6 +175,7 @@ jobs:
175175
run: |
176176
touch cabal.project
177177
echo "packages: $GITHUB_WORKSPACE/source/code/hsec-tools" >> cabal.project
178+
echo "packages: $GITHUB_WORKSPACE/source/code/cwe" >> cabal.project
178179
cat cabal.project
179180
- name: sdist
180181
run: |
@@ -188,15 +189,20 @@ jobs:
188189
run: |
189190
PKGDIR_hsec_tools="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/hsec-tools-[0-9.]*')"
190191
echo "PKGDIR_hsec_tools=${PKGDIR_hsec_tools}" >> "$GITHUB_ENV"
192+
PKGDIR_cwe="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/cwe-[0-9.]*')"
193+
echo "PKGDIR_cwe=${PKGDIR_cwe}" >> "$GITHUB_ENV"
191194
rm -f cabal.project cabal.project.local
192195
touch cabal.project
193196
touch cabal.project.local
194197
echo "packages: ${PKGDIR_hsec_tools}" >> cabal.project
198+
echo "packages: ${PKGDIR_cwe}" >> cabal.project
195199
echo "package hsec-tools" >> cabal.project
196200
echo " ghc-options: -Werror=missing-methods" >> cabal.project
201+
echo "package cwe" >> cabal.project
202+
echo " ghc-options: -Werror=missing-methods" >> cabal.project
197203
cat >> cabal.project <<EOF
198204
EOF
199-
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(hsec-tools)$/; }' >> cabal.project.local
205+
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(cwe|hsec-tools)$/; }' >> cabal.project.local
200206
cat cabal.project
201207
cat cabal.project.local
202208
- name: dump install plan
@@ -226,10 +232,13 @@ jobs:
226232
run: |
227233
if [ $((HCNUMVER >= 90400 && HCNUMVER < 90600)) -ne 0 ] ; then (cd ${PKGDIR_hsec_tools} && hlint -XHaskell2010 src) ; fi
228234
if [ $((HCNUMVER >= 90400 && HCNUMVER < 90600)) -ne 0 ] ; then (cd ${PKGDIR_hsec_tools} && hlint -XHaskell2010 app) ; fi
235+
if [ $((HCNUMVER >= 90400 && HCNUMVER < 90600)) -ne 0 ] ; then (cd ${PKGDIR_cwe} && hlint -XHaskell2010 src) ; fi
229236
- name: cabal check
230237
run: |
231238
cd ${PKGDIR_hsec_tools} || false
232239
${CABAL} -vnormal check
240+
cd ${PKGDIR_cwe} || false
241+
${CABAL} -vnormal check
233242
- name: haddock
234243
run: |
235244
$CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all

cabal.project

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
tested-with: GHC==9.2.5
2+
3+
packages: code/hsec-tools, code/cwe

code/cabal.project

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)