Skip to content

Commit df60344

Browse files
fgazfgaz
committed
fixup! sourcehut: add golden tests
1 parent 53c2225 commit df60344

File tree

5 files changed

+168
-8
lines changed

5 files changed

+168
-8
lines changed

‎fixtures/all-versions.sourcehut‎

Lines changed: 81 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SUCCESS
2-
# *INFO* Generating Sourcehut config for testing for GHC versions: 7.0.1 7.0.2 7.0.3 7.0.4 7.2.1 7.2.2 7.4.1 7.4.2 7.6.1 7.6.2 7.6.3 7.8.1 7.8.2 7.8.3 7.8.4 7.10.1 7.10.2 7.10.3 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 9.0.1 9.2.1 ghcjs-8.4
2+
# *INFO* Generating Sourcehut config for testing for GHC versions: 7.0.1 7.0.2 7.0.3 7.0.4 7.2.1 7.2.2 7.4.1 7.4.2 7.6.1 7.6.2 7.6.3 7.8.1 7.8.2 7.8.3 7.8.4 7.10.1 7.10.2 7.10.3 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 9.0.1 9.0.2 9.2.1 9.2.2 9.2.3 9.4.1 ghcjs-8.4
33
# manifest name: all
44
# This Sourcehut job script has been generated by a script via
55
#
@@ -60,7 +60,11 @@ packages:
6060
- ghc-8.10.6
6161
- ghc-8.10.7
6262
- ghc-9.0.1
63+
- ghc-9.0.2
6364
- ghc-9.2.1
65+
- ghc-9.2.2
66+
- ghc-9.2.3
67+
- ghc-9.4.1
6468
- ghcjs-8.4
6569
repositories:
6670
hvr-ghc: http://ppa.launchpad.net/hvr/ghc/ubuntu bionic main ff3aeacef6f88286
@@ -888,6 +892,25 @@ tasks:
888892
- 9_0_1-haddock: |
889893
cd example.org
890894
cabal haddock all
895+
- 9_0_2-prepare: |
896+
cd example.org
897+
cabal configure -w /opt/ghc/bin/ghc-9.0.2
898+
- 9_0_2-check: |
899+
cd example.org
900+
cabal check
901+
- 9_0_2-dependencies: |
902+
cd example.org
903+
cabal build all --enable-tests --only-dependencies
904+
cabal build all --only-dependencies
905+
- 9_0_2-build: |
906+
cd example.org
907+
cabal build all
908+
- 9_0_2-test: |
909+
cd example.org
910+
cabal test all --enable-tests
911+
- 9_0_2-haddock: |
912+
cd example.org
913+
cabal haddock all
891914
- 9_2_1-prepare: |
892915
cd example.org
893916
cabal configure -w /opt/ghc/bin/ghc-9.2.1
@@ -907,6 +930,63 @@ tasks:
907930
- 9_2_1-haddock: |
908931
cd example.org
909932
cabal haddock all
933+
- 9_2_2-prepare: |
934+
cd example.org
935+
cabal configure -w /opt/ghc/bin/ghc-9.2.2
936+
- 9_2_2-check: |
937+
cd example.org
938+
cabal check
939+
- 9_2_2-dependencies: |
940+
cd example.org
941+
cabal build all --enable-tests --only-dependencies
942+
cabal build all --only-dependencies
943+
- 9_2_2-build: |
944+
cd example.org
945+
cabal build all
946+
- 9_2_2-test: |
947+
cd example.org
948+
cabal test all --enable-tests
949+
- 9_2_2-haddock: |
950+
cd example.org
951+
cabal haddock all
952+
- 9_2_3-prepare: |
953+
cd example.org
954+
cabal configure -w /opt/ghc/bin/ghc-9.2.3
955+
- 9_2_3-check: |
956+
cd example.org
957+
cabal check
958+
- 9_2_3-dependencies: |
959+
cd example.org
960+
cabal build all --enable-tests --only-dependencies
961+
cabal build all --only-dependencies
962+
- 9_2_3-build: |
963+
cd example.org
964+
cabal build all
965+
- 9_2_3-test: |
966+
cd example.org
967+
cabal test all --enable-tests
968+
- 9_2_3-haddock: |
969+
cd example.org
970+
cabal haddock all
971+
- 9_4_1-prepare: |
972+
cd example.org
973+
cabal configure -w /opt/ghc/bin/ghc-9.4.1
974+
- 9_4_1-check: |
975+
cd example.org
976+
cabal check
977+
- 9_4_1-dependencies: |
978+
cd example.org
979+
cabal build all --enable-tests --only-dependencies
980+
cabal build all --only-dependencies
981+
- 9_4_1-build: |
982+
cd example.org
983+
cabal build all
984+
- 9_4_1-test: |
985+
cd example.org
986+
cabal test all --enable-tests
987+
- 9_4_1-haddock: |
988+
cd example.org
989+
cabal haddock all
910990
- ghcjs-8_4-prepare: |
911991
cd example.org
912992
cabal configure -w /opt/ghc/bin/ghcjs-8.4

‎fixtures/enabled-jobs.sourcehut‎

Lines changed: 81 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SUCCESS
2-
# *INFO* Generating Sourcehut config for testing for GHC versions: 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 9.0.1 9.2.1 ghcjs-8.4
2+
# *INFO* Generating Sourcehut config for testing for GHC versions: 8.0.1 8.0.2 8.2.1 8.2.2 8.4.1 8.4.2 8.4.3 8.4.4 8.6.1 8.6.2 8.6.3 8.6.4 8.6.5 8.8.1 8.8.2 8.8.3 8.8.4 8.10.1 8.10.2 8.10.3 8.10.4 8.10.5 8.10.6 8.10.7 9.0.1 9.0.2 9.2.1 9.2.2 9.2.3 9.4.1 ghcjs-8.4
33
# manifest name: all
44
# This Sourcehut job script has been generated by a script via
55
#
@@ -42,7 +42,11 @@ packages:
4242
- ghc-8.10.6
4343
- ghc-8.10.7
4444
- ghc-9.0.1
45+
- ghc-9.0.2
4546
- ghc-9.2.1
47+
- ghc-9.2.2
48+
- ghc-9.2.3
49+
- ghc-9.4.1
4650
- ghcjs-8.4
4751
repositories:
4852
hvr-ghc: http://ppa.launchpad.net/hvr/ghc/ubuntu bionic main ff3aeacef6f88286
@@ -528,6 +532,25 @@ tasks:
528532
- 9_0_1-haddock: |
529533
cd example.org
530534
cabal haddock all
535+
- 9_0_2-prepare: |
536+
cd example.org
537+
cabal configure -w /opt/ghc/bin/ghc-9.0.2
538+
- 9_0_2-check: |
539+
cd example.org
540+
cabal check
541+
- 9_0_2-dependencies: |
542+
cd example.org
543+
cabal build all --enable-tests --only-dependencies
544+
cabal build all --only-dependencies
545+
- 9_0_2-build: |
546+
cd example.org
547+
cabal build all
548+
- 9_0_2-test: |
549+
cd example.org
550+
cabal test all --enable-tests
551+
- 9_0_2-haddock: |
552+
cd example.org
553+
cabal haddock all
531554
- 9_2_1-prepare: |
532555
cd example.org
533556
cabal configure -w /opt/ghc/bin/ghc-9.2.1
@@ -547,6 +570,63 @@ tasks:
547570
- 9_2_1-haddock: |
548571
cd example.org
549572
cabal haddock all
573+
- 9_2_2-prepare: |
574+
cd example.org
575+
cabal configure -w /opt/ghc/bin/ghc-9.2.2
576+
- 9_2_2-check: |
577+
cd example.org
578+
cabal check
579+
- 9_2_2-dependencies: |
580+
cd example.org
581+
cabal build all --enable-tests --only-dependencies
582+
cabal build all --only-dependencies
583+
- 9_2_2-build: |
584+
cd example.org
585+
cabal build all
586+
- 9_2_2-test: |
587+
cd example.org
588+
cabal test all --enable-tests
589+
- 9_2_2-haddock: |
590+
cd example.org
591+
cabal haddock all
592+
- 9_2_3-prepare: |
593+
cd example.org
594+
cabal configure -w /opt/ghc/bin/ghc-9.2.3
595+
- 9_2_3-check: |
596+
cd example.org
597+
cabal check
598+
- 9_2_3-dependencies: |
599+
cd example.org
600+
cabal build all --enable-tests --only-dependencies
601+
cabal build all --only-dependencies
602+
- 9_2_3-build: |
603+
cd example.org
604+
cabal build all
605+
- 9_2_3-test: |
606+
cd example.org
607+
cabal test all --enable-tests
608+
- 9_2_3-haddock: |
609+
cd example.org
610+
cabal haddock all
611+
- 9_4_1-prepare: |
612+
cd example.org
613+
cabal configure -w /opt/ghc/bin/ghc-9.4.1
614+
- 9_4_1-check: |
615+
cd example.org
616+
cabal check
617+
- 9_4_1-dependencies: |
618+
cd example.org
619+
cabal build all --enable-tests --only-dependencies
620+
cabal build all --only-dependencies
621+
- 9_4_1-build: |
622+
cd example.org
623+
cabal build all
624+
- 9_4_1-test: |
625+
cd example.org
626+
cabal test all --enable-tests
627+
- 9_4_1-haddock: |
628+
cd example.org
629+
cabal haddock all
550630
- ghcjs-8_4-prepare: |
551631
cd example.org
552632
cabal configure -w /opt/ghc/bin/ghcjs-8.4

‎fixtures/sourcehut-parallel.bash‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ change_dir "$BUILDDIR"
508508

509509
# haddock
510510
put_info "haddock"
511-
run_cmd $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
511+
run_cmd $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
512512

513513
# unconstrained build
514514
put_info "unconstrained build"

‎fixtures/sourcehut-parallel.github‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ on:
1919
jobs:
2020
linux:
2121
name: Haskell-CI - Linux - ${{ matrix.compiler }}
22-
runs-on: ubuntu-18.04
22+
runs-on: ubuntu-20.04
2323
timeout-minutes:
2424
60
2525
container:
@@ -191,7 +191,7 @@ jobs:
191191
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
192192
if [ "${{ matrix.setup-method }}" = ghcup ]; then
193193
mkdir -p "$HOME/.ghcup/bin"
194-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
194+
curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"
195195
chmod a+x "$HOME/.ghcup/bin/ghcup"
196196
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
197197
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
@@ -200,7 +200,7 @@ jobs:
200200
apt-get update
201201
apt-get install -y "$HCNAME"
202202
mkdir -p "$HOME/.ghcup/bin"
203-
curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
203+
curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"
204204
chmod a+x "$HOME/.ghcup/bin/ghcup"
205205
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
206206
fi
@@ -345,7 +345,7 @@ jobs:
345345
${CABAL} -vnormal check
346346
- name: haddock
347347
run: |
348-
$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
348+
$CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
349349
- name: unconstrained build
350350
run: |
351351
rm -f cabal.project.local

‎fixtures/sourcehut-parallel.travis‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ script:
218218
# cabal check...
219219
- (cd ${PKGDIR_servant} && ${CABAL} -vnormal check)
220220
# haddock...
221-
- ${CABAL} v2-haddock $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
221+
- ${CABAL} v2-haddock --haddock-all $WITHCOMPILER --with-haddock $HADDOCK ${TEST} ${BENCH} all
222222
# Building without installed constraints for packages in global-db...
223223
- rm -f cabal.project.local
224224
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all

0 commit comments

Comments
 (0)