Skip to content

Commit d5a8c27

Browse files
phadejphadej
committed
Dec is now in own repository
1 parent 36cdebb commit d5a8c27

File tree

8 files changed

+21
-269
lines changed

8 files changed

+21
-269
lines changed

‎.github/workflows/haskell-ci.yml‎

Lines changed: 20 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#
99
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.13.20211116
11+
# version: 0.15.20220822
1212
#
13-
# REGENDATA ("0.13.20211116",["github","--config=cabal.haskell-ci","cabal.project"])
13+
# REGENDATA ("0.15.20220822",["github","--config=cabal.haskell-ci","cabal.project"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -23,7 +23,7 @@ on:
2323
jobs:
2424
linux:
2525
name: Haskell-CI - Linux - ${{ matrix.compiler }}
26-
runs-on: ubuntu-18.04
26+
runs-on: ubuntu-20.04
2727
timeout-minutes:
2828
60
2929
container:
@@ -90,18 +90,18 @@ jobs:
9090
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
9191
if [ "${{ matrix.setup-method }}" = ghcup ]; then
9292
mkdir -p "$HOME/.ghcup/bin"
93-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
93+
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
9494
chmod a+x "$HOME/.ghcup/bin/ghcup"
95-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
96-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
95+
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
96+
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
9797
else
9898
apt-add-repository -y 'ppa:hvr/ghc'
9999
apt-get update
100100
apt-get install -y "$HCNAME"
101101
mkdir -p "$HOME/.ghcup/bin"
102-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
102+
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
103103
chmod a+x "$HOME/.ghcup/bin/ghcup"
104-
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
104+
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
105105
fi
106106
env:
107107
HCKIND: ${{ matrix.compilerKind }}
@@ -177,7 +177,7 @@ jobs:
177177
- name: cache (tools)
178178
uses: actions/cache@v2
179179
with:
180-
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-8df336bd
180+
key: ${{ runner.os }}-${{ matrix.compiler }}-tools-2369439b
181181
path: ~/.haskell-ci-tools
182182
- name: install cabal-plan
183183
run: |
@@ -199,7 +199,7 @@ jobs:
199199
cabal-docspec --version
200200
- name: install doctest
201201
run: |
202-
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.17' ; fi
202+
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.20' ; fi
203203
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then doctest --version ; fi
204204
- name: checkout
205205
uses: actions/checkout@v2
@@ -209,7 +209,6 @@ jobs:
209209
run: |
210210
touch cabal.project
211211
echo "packages: $GITHUB_WORKSPACE/source/bin" >> cabal.project
212-
echo "packages: $GITHUB_WORKSPACE/source/dec" >> cabal.project
213212
echo "packages: $GITHUB_WORKSPACE/source/fin" >> cabal.project
214213
echo "packages: $GITHUB_WORKSPACE/source/ral" >> cabal.project
215214
echo "packages: $GITHUB_WORKSPACE/source/vec" >> cabal.project
@@ -231,8 +230,6 @@ jobs:
231230
run: |
232231
PKGDIR_bin="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/bin-[0-9.]*')"
233232
echo "PKGDIR_bin=${PKGDIR_bin}" >> "$GITHUB_ENV"
234-
PKGDIR_dec="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/dec-[0-9.]*')"
235-
echo "PKGDIR_dec=${PKGDIR_dec}" >> "$GITHUB_ENV"
236233
PKGDIR_fin="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/fin-[0-9.]*')"
237234
echo "PKGDIR_fin=${PKGDIR_fin}" >> "$GITHUB_ENV"
238235
PKGDIR_ral="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/ral-[0-9.]*')"
@@ -253,7 +250,6 @@ jobs:
253250
touch cabal.project
254251
touch cabal.project.local
255252
echo "packages: ${PKGDIR_bin}" >> cabal.project
256-
echo "packages: ${PKGDIR_dec}" >> cabal.project
257253
echo "packages: ${PKGDIR_fin}" >> cabal.project
258254
echo "packages: ${PKGDIR_ral}" >> cabal.project
259255
echo "packages: ${PKGDIR_vec}" >> cabal.project
@@ -264,8 +260,6 @@ jobs:
264260
echo "packages: ${PKGDIR_tests}" >> cabal.project
265261
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package bin" >> cabal.project ; fi
266262
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
267-
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package dec" >> cabal.project ; fi
268-
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
269263
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package fin" >> cabal.project ; fi
270264
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
271265
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package ral" >> cabal.project ; fi
@@ -287,7 +281,7 @@ jobs:
287281
allow-newer: vector-th-unbox-0.2.1.7:base
288282
allow-newer: vector-th-unbox-0.2.1.7:template-haskell
289283
EOF
290-
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(bin|dec|fin|ral|ral-lens|ral-optics|tests|vec|vec-lens|vec-optics)$/; }' >> cabal.project.local
284+
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(bin|fin|ral|ral-lens|ral-optics|tests|vec|vec-lens|vec-optics)$/; }' >> cabal.project.local
291285
cat cabal.project
292286
cat cabal.project.local
293287
- name: dump install plan
@@ -316,25 +310,23 @@ jobs:
316310
- name: doctest
317311
run: |
318312
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then cd ${PKGDIR_bin} || false ; fi
319-
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then doctest src ; fi
320-
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then cd ${PKGDIR_dec} || false ; fi
321-
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then doctest src ; fi
313+
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then doctest -XHaskell2010 src ; fi
322314
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then cd ${PKGDIR_fin} || false ; fi
323-
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then doctest src ; fi
315+
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then doctest -XHaskell2010 src ; fi
324316
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then cd ${PKGDIR_ral} || false ; fi
325-
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then doctest src ; fi
317+
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then doctest -XHaskell2010 src ; fi
326318
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then cd ${PKGDIR_vec} || false ; fi
327-
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then doctest src ; fi
319+
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then doctest -XHaskell2010 src ; fi
328320
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then cd ${PKGDIR_ral_lens} || false ; fi
329-
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then doctest src ; fi
321+
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then doctest -XHaskell2010 src ; fi
330322
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then cd ${PKGDIR_vec_lens} || false ; fi
331-
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then doctest src ; fi
323+
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then doctest -XHaskell2010 src ; fi
332324
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then cd ${PKGDIR_ral_optics} || false ; fi
333-
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then doctest src ; fi
325+
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then doctest -XHaskell2010 src ; fi
334326
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then cd ${PKGDIR_vec_optics} || false ; fi
335-
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then doctest src ; fi
327+
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then doctest -XHaskell2010 src ; fi
336328
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then cd ${PKGDIR_tests} || false ; fi
337-
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then doctest src ; fi
329+
if [ $((HCNUMVER >= 80600 && HCNUMVER < 90000)) -ne 0 ] ; then doctest -XHaskell2010 src ; fi
338330
- name: docspec
339331
run: |
340332
if [ $((HCNUMVER >= 80000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all ; fi
@@ -343,8 +335,6 @@ jobs:
343335
run: |
344336
cd ${PKGDIR_bin} || false
345337
${CABAL} -vnormal check
346-
cd ${PKGDIR_dec} || false
347-
${CABAL} -vnormal check
348338
cd ${PKGDIR_fin} || false
349339
${CABAL} -vnormal check
350340
cd ${PKGDIR_ral} || false

‎cabal.haskell-ci‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ tests: >=8.0
33
doctest: >=8.6 && <9
44
docspec: >=8.0
55
haddock: >=8.6
6+
haddock-components: libs
67

78
jobs-selection: any
89

‎cabal.project‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
packages: bin
2-
packages: dec
32
packages: fin
43
packages: ral
54
packages: vec

‎dec/ChangeLog.md‎

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

‎dec/LICENSE‎

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

‎dec/cabal.project‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎dec/dec.cabal‎

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

0 commit comments

Comments
 (0)