Skip to content

Commit 326cc1a

Browse files
hasufellhasufell
committed
Wibble
1 parent b80faa6 commit 326cc1a

File tree

2 files changed

+22
-6
lines changed

2 files changed

+22
-6
lines changed

‎.github/scripts/test.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ cabal update
2626

2727
# TODO: we want to avoid building here... we should just
2828
# be using the previously built 'cabal-tests' binary
29-
cabal run cabal-testsuite:cabal-tests -- \
29+
cabal run ${ADD_CABAL_ARGS} cabal-testsuite:cabal-tests -- \
3030
--with-cabal "$(pwd)/out/cabal" \
3131
--intree-cabal-lib "$(pwd)" \
3232
--test-tmp "$(pwd)/testdb" \

‎.github/workflows/release.yaml‎

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ jobs:
136136
},
137137
{ image: "ghcr.io/void-linux/void-glibc:latest"
138138
, installCmd: "xbps-install -Suy xbps && xbps-install -Sy"
139-
, toolRequirements: "ncurses-libtinfo-libs autoconf automake binutils bzip2 coreutils curl elfutils-devel elfutils findutils gcc gmp gmp-devel jq lbzip2 make ncurses ncurses-devel openssh patch perl python3 sqlite sudo wget which xz tar zlib-devel patchelf"
139+
, toolRequirements: "ncurses-libtinfo-libs autoconf automake binutils bzip2 coreutils curl elfutils-devel elfutils findutils gcc gmp gmp-devel jq lbzip2 make ncurses ncurses-devel openssh patch perl python3 sqlite sudo wget which xz tar zlib-devel patchelf gzip"
140140
, DISTRO: "Unknown"
141141
, ARTIFACT: "x86_64-linux-void-glibc"
142142
, ADD_CABAL_ARGS: "--enable-split-sections"
@@ -193,7 +193,7 @@ jobs:
193193
- name: Run build (32 bit linux)
194194
uses: docker://hasufell/i386-alpine-haskell:3.21
195195
with:
196-
args: sh -c "apk update && apk add bash binutils-gold curl gcc g++ gmp-dev libc-dev libffi-dev make musl-dev ncurses-dev perl tar xz autoconf automake bzip2 coreutils elfutils-dev findutils git jq bzip2-dev patch python3 sqlite sudo wget which zlib-dev patchelf zlib zlib-dev zlib-static && bash .github/scripts/build.sh"
196+
args: sh -c "apk update && apk add groff bash binutils-gold curl gcc g++ gmp-dev libc-dev libffi-dev make musl-dev ncurses-dev perl tar xz autoconf automake bzip2 coreutils elfutils-dev findutils git jq bzip2-dev patch python3 sqlite sudo wget which zlib-dev patchelf zlib zlib-dev zlib-static && bash .github/scripts/build.sh"
197197

198198
- if: always()
199199
name: Upload artifact
@@ -428,96 +428,112 @@ jobs:
428428
, toolRequirements: "groff-base libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl ghc gzip libffi-dev libncurses-dev libncurses5 libtinfo5 patchelf"
429429
, DISTRO: "Debian"
430430
, ARTIFACT: "x86_64-linux-deb10"
431+
, ADD_CABAL_ARGS: "--enable-split-sections"
431432
},
432433
{ image: "debian:11"
433434
, installCmd: "apt-get update && apt-get install -y"
434435
, toolRequirements: "groff-base libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl ghc gzip libffi-dev libncurses-dev libncurses5 libtinfo5 patchelf"
435436
, DISTRO: "Debian"
436437
, ARTIFACT: "x86_64-linux-deb11"
438+
, ADD_CABAL_ARGS: "--enable-split-sections"
437439
},
438440
{ image: "debian:12"
439441
, installCmd: "apt-get update && apt-get install -y"
440442
, toolRequirements: "groff-base libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl ghc gzip libffi-dev libncurses-dev libncurses5 libtinfo5 patchelf"
441443
, DISTRO: "Debian"
442444
, ARTIFACT: "x86_64-linux-deb12"
445+
, ADD_CABAL_ARGS: "--enable-split-sections"
443446
},
444447
{ image: "ubuntu:20.04"
445448
, installCmd: "apt-get update && apt-get install -y"
446449
, toolRequirements: "groff-base libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl ghc gzip libffi-dev libncurses-dev libncurses5 libtinfo5 patchelf"
447450
, DISTRO: "Ubuntu"
448451
, ARTIFACT: "x86_64-linux-ubuntu20.04"
452+
, ADD_CABAL_ARGS: "--enable-split-sections"
449453
},
450454
{ image: "ubuntu:22.04"
451455
, installCmd: "apt-get update && apt-get install -y"
452456
, toolRequirements: "groff-base libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl ghc gzip libffi-dev libncurses-dev libncurses5 libtinfo5 patchelf"
453457
, DISTRO: "Ubuntu"
454458
, ARTIFACT: "x86_64-linux-ubuntu22.04"
459+
, ADD_CABAL_ARGS: "--enable-split-sections"
455460
},
456461
{ image: "ubuntu:24.04"
457462
, installCmd: "apt-get update && apt-get install -y"
458463
, toolRequirements: "groff-base libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl ghc gzip libffi-dev libncurses-dev libncurses6 libtinfo6 patchelf"
459464
, DISTRO: "Ubuntu"
460465
, ARTIFACT: "x86_64-linux-ubuntu24.04"
466+
, ADD_CABAL_ARGS: "--enable-split-sections"
461467
},
462468
{ image: "linuxmintd/mint20.3-amd64"
463469
, installCmd: "apt-get update && apt-get install -y"
464470
, toolRequirements: "groff-base libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl ghc gzip libffi-dev libncurses-dev libncurses5 libtinfo5 patchelf"
465471
, DISTRO: "Mint"
466472
, ARTIFACT: "x86_64-linux-mint20"
473+
, ADD_CABAL_ARGS: "--enable-split-sections"
467474
},
468475
{ image: "linuxmintd/mint21.3-amd64"
469476
, installCmd: "apt-get update && apt-get install -y"
470477
, toolRequirements: "groff-base libnuma-dev zlib1g-dev libgmp-dev libgmp10 libssl-dev liblzma-dev libbz2-dev git wget lsb-release software-properties-common gnupg2 apt-transport-https gcc autoconf automake build-essential curl ghc gzip libffi-dev libncurses-dev libncurses5 libtinfo5 patchelf"
471478
, DISTRO: "Mint"
472479
, ARTIFACT: "x86_64-linux-mint21"
480+
, ADD_CABAL_ARGS: "--enable-split-sections"
473481
},
474482
{ image: "fedora:33"
475483
, installCmd: "dnf install -y"
476484
, toolRequirements: "groff-base autoconf automake binutils bzip2 coreutils curl elfutils-devel elfutils-libs findutils gcc gcc-c++ git gmp gmp-devel jq lbzip2 make ncurses ncurses-compat-libs ncurses-devel openssh-clients patch perl pxz python3 sqlite sudo wget which xz zlib-devel patchelf"
477485
, DISTRO: "Fedora"
478486
, ARTIFACT: "x86_64-linux-fedora33"
487+
, ADD_CABAL_ARGS: "--enable-split-sections"
479488
},
480489
{ image: "fedora:37"
481490
, installCmd: "dnf install -y"
482491
, toolRequirements: "groff-base autoconf automake binutils bzip2 coreutils curl elfutils-devel elfutils-libs findutils gcc gcc-c++ git gmp gmp-devel jq lbzip2 make ncurses ncurses-compat-libs ncurses-devel openssh-clients patch perl pxz python3 sqlite sudo wget which xz zlib-devel patchelf"
483492
, DISTRO: "Fedora"
484493
, ARTIFACT: "x86_64-linux-fedora37"
494+
, ADD_CABAL_ARGS: "--enable-split-sections"
485495
},
486496
{ image: "rockylinux:8"
487497
, installCmd: "yum -y install epel-release && yum install -y --allowerasing"
488498
, toolRequirements: "groff-base autoconf automake binutils bzip2 coreutils curl elfutils-devel elfutils-libs findutils gcc gcc-c++ git gmp gmp-devel jq lbzip2 make ncurses ncurses-compat-libs ncurses-devel openssh-clients patch perl pxz python3 sqlite sudo wget which xz zlib-devel patchelf"
489499
, DISTRO: "Unknown"
490500
, ARTIFACT: "x86_64-linux-rocky8"
501+
, ADD_CABAL_ARGS: "--enable-split-sections"
491502
},
492503
{ image: "rockylinux:9"
493504
, installCmd: "yum -y install epel-release && yum install -y --allowerasing"
494505
, toolRequirements: "groff-base autoconf automake binutils bzip2 coreutils curl elfutils-devel elfutils-libs findutils gcc gcc-c++ git gmp gmp-devel jq lbzip2 make ncurses ncurses-compat-libs ncurses-devel openssh-clients patch perl pxz python3 sqlite sudo wget which xz zlib-devel patchelf"
495506
, DISTRO: "Unknown"
496507
, ARTIFACT: "x86_64-linux-rocky9"
508+
, ADD_CABAL_ARGS: "--enable-split-sections"
497509
},
498510
{ image: "alpine:latest"
499511
, installCmd: "apk update && apk add"
500512
, toolRequirements: "groff binutils-gold curl gcc g++ gmp-dev gmp-static libc-dev libffi-dev make musl-dev ncurses-dev perl tar xz autoconf automake bzip2 coreutils elfutils-dev findutils git jq bzip2-dev patch python3 sqlite sudo wget which zlib-dev patchelf zlib zlib-dev zlib-static"
501513
, DISTRO: "Unknown"
502514
, ARTIFACT: "x86_64-linux-unknown"
515+
, ADD_CABAL_ARGS: "--enable-split-sections --enable-executable-static"
503516
},
504517
{ image: "alpine:3.12"
505518
, installCmd: "apk update && apk add"
506519
, toolRequirements: "groff binutils-gold curl gcc g++ gmp-dev libc-dev libffi-dev make musl-dev ncurses-dev perl tar xz autoconf automake bzip2 coreutils elfutils-dev findutils git jq bzip2-dev patch python3 sqlite sudo wget which zlib-dev patchelf zlib zlib-dev zlib-static"
507520
, DISTRO: "Unknown"
508521
, ARTIFACT: "x86_64-linux-alpine312"
522+
, ADD_CABAL_ARGS: "--enable-split-sections"
509523
},
510524
{ image: "alpine:3.19"
511525
, installCmd: "apk update && apk add"
512526
, toolRequirements: "groff binutils-gold curl gcc g++ gmp-dev libc-dev libffi-dev make musl-dev ncurses-dev perl tar xz autoconf automake bzip2 coreutils elfutils-dev findutils git jq bzip2-dev patch python3 sqlite sudo wget which zlib-dev patchelf zlib zlib-dev zlib-static"
513527
, DISTRO: "Unknown"
514528
, ARTIFACT: "x86_64-linux-alpine319"
529+
, ADD_CABAL_ARGS: "--enable-split-sections"
515530
},
516531
{ image: "ghcr.io/void-linux/void-glibc:latest"
517532
, installCmd: "xbps-install -Suy xbps && xbps-install -Sy"
518-
, toolRequirements: "groff ncurses-libtinfo-libs autoconf automake binutils bzip2 coreutils curl elfutils-devel elfutils findutils gcc gmp gmp-devel jq lbzip2 make ncurses ncurses-devel openssh patch perl python3 sqlite sudo wget which xz tar zlib-devel patchelf"
533+
, toolRequirements: "groff ncurses-libtinfo-libs autoconf automake binutils bzip2 coreutils curl elfutils-devel elfutils findutils gcc gmp gmp-devel jq lbzip2 make ncurses ncurses-devel openssh patch perl python3 sqlite sudo wget which xz tar zlib-devel patchelf gzip"
519534
, DISTRO: "Unknown"
520535
, ARTIFACT: "x86_64-linux-void-glibc"
536+
, ADD_CABAL_ARGS: "--enable-split-sections"
521537
}
522538
]
523539
container:
@@ -606,7 +622,7 @@ jobs:
606622
uses: docker://hasufell/arm64v8-debian-haskell:10
607623
name: Run build (aarch64 linux)
608624
with:
609-
args: sh -c "git config --system --add safe.directory $GITHUB_WORKSPACE && bash .github/scripts/test.sh"
625+
args: sh -c "git config --system --add safe.directory $GITHUB_WORKSPACE && apt-get install -y groff-base && bash .github/scripts/test.sh"
610626
env:
611627
ARTIFACT: ${{ matrix.ARTIFACT }}
612628
DISTRO: ${{ matrix.DISTRO }}
@@ -615,7 +631,7 @@ jobs:
615631
uses: docker://hasufell/arm64v8-alpine-haskell:3.21
616632
name: Run build (aarch64 linux alpine)
617633
with:
618-
args: sh -c "git config --system --add safe.directory $GITHUB_WORKSPACE && bash .github/scripts/test.sh"
634+
args: sh -c "git config --system --add safe.directory $GITHUB_WORKSPACE && apk add groff && bash .github/scripts/test.sh"
619635
env:
620636
ARTIFACT: ${{ matrix.ARTIFACT }}
621637
DISTRO: ${{ matrix.DISTRO }}

0 commit comments

Comments
 (0)