Skip to content

Stable haskell/ci speedup #132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hasufell wants to merge 7 commits into
base: stable-ghc-9.14
Choose a base branch
from
Open

Stable haskell/ci speedup #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
07d68c5
MAKE: Don't build cabal in Makefile anymore
hasufell Dec 11, 2025
5fbf65e
CI: use 3.17.0.1 pre-built binary
hasufell Dec 11, 2025
016a471
Bump cabal submodule
hasufell Dec 11, 2025
24397bb
Don't check out submodules in test
hasufell Dec 11, 2025
09a560e
Add script to conveniently build the bundled cabal
hasufell Dec 11, 2025
b630ec6
Fix nix CI
hasufell Dec 12, 2025
4cca24c
Disentangle stage1 and stage2
hasufell Dec 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:

- name: Build the bindist
shell: devx {0}
run: make CABAL=$PWD/_build/stage0/bin/cabal
run: make CABAL=$(./build-cabal.sh)

- name: Upload artifacts
uses: actions/upload-artifact@v4
Expand All @@ -62,7 +62,7 @@ jobs:

- name: Run the testsuite
shell: devx {0}
run: make test CABAL=$PWD/_build/stage0/bin/cabal
run: make test CABAL=$(./build-cabal.sh)

- name: Upload test results
uses: actions/upload-artifact@v4
Expand Down
47 changes: 17 additions & 30 deletions .github/workflows/reusable-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
default: "install_bin install_lib update_package_db"
cabal:
type: string
default: 3.14.2.0
default: 3.17.0.1
test:
type: boolean
default: true
Expand All @@ -28,8 +28,7 @@ env:
CABAL_VERSION: ${{ inputs.cabal }}
# ghcup
BOOTSTRAP_HASKELL_NONINTERACTIVE: 1
BOOTSTRAP_HASKELL_GHC_VERSION: ${{ inputs.ghc }}
BOOTSTRAP_HASKELL_CABAL_VERSION: ${{ inputs.cabal }}
BOOTSTRAP_HASKELL_MINIMAL: 1
BOOTSTRAP_HASKELL_INSTALL_NO_STACK: 1
# debian/ubuntu
DEBIAN_FRONTEND: noninteractive
Expand Down Expand Up @@ -105,6 +104,11 @@ jobs:
with:
cabal: ${{ env.CABAL_VERSION }}
ghc: ${{ env.GHC_VERSION }}
config: &ghcup-config |
meta-cache: 0
url-source:
- GHCupURL
- https://raw.githubusercontent.com/haskell/ghcup-metadata/refs/heads/stable-haskell-0.0.1/stable-haskell-0.0.9.yaml

- uses: actions/checkout@v4
with:
Expand All @@ -128,11 +132,6 @@ jobs:
ln -s make /usr/local/bin/gmake
echo "/usr/local/bin" >> $GITHUB_PATH

- name: Add extra-lib-dirs
run: &extra-lib-dirs |
echo "extra-lib-dirs: $HOME/.local/lib/" >> cabal.project.stage2
echo "extra-lib-dirs: $HOME/.local/lib/" >> cabal.project.stage3

- if: matrix.platform.image == 'rockylinux:8'
name: Install emscripten
run : &emscripten |
Expand Down Expand Up @@ -166,16 +165,13 @@ jobs:
cd emsdk
source ./emsdk_env.sh
cd ..
${{ env.MAKE }} _build/bindist/haskell-toolchain.tar.gz _build/bindist/tests.tar.gz
${{ env.MAKE }} _build/bindist/ghc.tar.gz _build/bindist/ghc-javascript-unknown-ghcjs.tar.gz _build/bindist/tests.tar.gz
else
echo $PWD
${{ env.MAKE }} --debug _build/bindist/ghc.tar.gz _build/bindist/cabal.tar.gz _build/bindist/tests.tar.gz
${{ env.MAKE }} _build/bindist/ghc.tar.gz _build/bindist/tests.tar.gz
fi
cd _build/bindist
mv ghc.tar.gz ghc-$(bin/ghc --numeric-version)-${ARTIFACT}.tar.gz
mv cabal.tar.gz cabal-$(bin/cabal --numeric-version)-${ARTIFACT}.tar.gz
if [ -e "haskell-toolchain.tar.gz" ] ; then
mv haskell-toolchain.tar.gz haskell-toolchain-${ARTIFACT}.tar.gz
if [ -e "ghc-javascript-unknown-ghcjs.tar.gz" ] ; then
mv ghc-javascript-unknown-ghcjs.tar.gz ghc-javascript-unknown-ghcjs-$(bin/ghc --numeric-version)-${ARTIFACT}.tar.gz
fi
mv tests.tar.gz tests-${ARTIFACT}.tar.gz
Expand Down Expand Up @@ -215,13 +211,13 @@ jobs:
uses: docker://arm64v8/debian:11
name: Run build (aarch64 linux)
with:
args: sh -c "apt-get update && apt-get install -y curl bash git ${{ needs.tool-output.outputs.apt_tools_build }} && export PATH=$HOME/.ghcup/bin:$PATH && curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh && make CABAL=$PWD/_build/stage0/bin/cabal _build/bindist/ghc.tar.gz _build/bindist/cabal.tar.gz _build/bindist/tests.tar.gz && cd _build/bindist && mv ghc.tar.gz ghc-$(bin/ghc --numeric-version)-${{ matrix.platform.ARTIFACT }}.tar.gz && mv cabal.tar.gz cabal-$(bin/cabal --numeric-version)-${{ matrix.platform.ARTIFACT }}.tar.gz && mv tests.tar.gz tests-${{ matrix.platform.ARTIFACT }}.tar.gz"
args: sh -c "apt-get update && apt-get install -y curl bash git ${{ needs.tool-output.outputs.apt_tools_build }} && export PATH=$HOME/.ghcup/bin:$PATH && curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh && ghcup config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/refs/heads/stable-haskell-0.0.1/stable-haskell-0.0.9.yaml && ghcup install ghc --set ${{ env.GHC_VERSION }} && ghcup install cabal --set ${{ env.CABAL_VERSION }} && make USE_SYSTEM_CABAL=1 _build/bindist/ghc.tar.gz _build/bindist/tests.tar.gz && cd _build/bindist && mv ghc.tar.gz ghc-$(bin/ghc --numeric-version)-${{ matrix.platform.ARTIFACT }}.tar.gz && mv tests.tar.gz tests-${{ matrix.platform.ARTIFACT }}.tar.gz"

- if: matrix.platform.ARTIFACT == 'aarch64-linux-unknown'
uses: docker://arm64v8/alpine:3.20
name: Run build (aarch64 linux alpine)
with:
args: sh -c "apk update && apk add curl bash git ${{ needs.tool-output.outputs.apk_tools_build }} && export PATH=$HOME/.ghcup/bin:$PATH && curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh && make CABAL=$PWD/_build/stage0/bin/cabal _build/bindist/ghc.tar.gz _build/bindist/cabal.tar.gz _build/bindist/tests.tar.gz && cd _build/bindist && mv ghc.tar.gz ghc-$(bin/ghc --numeric-version)-${{ matrix.platform.ARTIFACT }}.tar.gz && mv cabal.tar.gz cabal-$(bin/cabal --numeric-version)-${{ matrix.platform.ARTIFACT }}.tar.gz && mv tests.tar.gz tests-${{ matrix.platform.ARTIFACT }}.tar.gz"
args: sh -c "apk update && apk add curl bash git ${{ needs.tool-output.outputs.apk_tools_build }} && export PATH=$HOME/.ghcup/bin:$PATH && curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh && ghcup config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/refs/heads/stable-haskell-0.0.1/stable-haskell-0.0.9.yaml && ghcup install ghc --set ${{ env.GHC_VERSION }} && ghcup install cabal --set ${{ env.CABAL_VERSION }} && make USE_SYSTEM_CABAL=1 _build/bindist/ghc.tar.gz _build/bindist/tests.tar.gz && cd _build/bindist && mv ghc.tar.gz ghc-$(bin/ghc --numeric-version)-${{ matrix.platform.ARTIFACT }}.tar.gz && mv tests.tar.gz tests-${{ matrix.platform.ARTIFACT }}.tar.gz"

- if: always()
name: Upload artifact
Expand Down Expand Up @@ -255,6 +251,7 @@ jobs:
with:
cabal: ${{ env.CABAL_VERSION }}
ghc: ${{ env.GHC_VERSION }}
config: *ghcup-config

- name: Install dependencies
run : |
Expand All @@ -263,9 +260,6 @@ jobs:
echo "/usr/local/opt/make/libexec/gnubin" >> $GITHUB_PATH
echo "/usr/local/opt/libtool/libexec/gnubin" >> $GITHUB_PATH

- name: Add extra-lib-dirs
run: *extra-lib-dirs

- name: Install emscripten
run : *emscripten

Expand Down Expand Up @@ -305,6 +299,7 @@ jobs:
with:
cabal: ${{ env.CABAL_VERSION }}
ghc: ${{ env.GHC_VERSION }}
config: *ghcup-config

- name: Install dependencies
run : |
Expand All @@ -313,9 +308,6 @@ jobs:
echo "/opt/homebrew/opt/make/libexec/gnubin" >> $GITHUB_PATH
echo "/opt/homebrew/opt/libtool/libexec/gnubin" >> $GITHUB_PATH

- name: Add extra-lib-dirs
run: *extra-lib-dirs

- name: Run build
run: *build

Expand Down Expand Up @@ -359,6 +351,7 @@ jobs:
with:
cabal: ${{ env.CABAL_VERSION }}
ghc: ${{ env.GHC_VERSION }}
config: *ghcup-config
env:
GHCUP_MSYS2: 'C:/msys64'

Expand Down Expand Up @@ -401,6 +394,7 @@ jobs:
with:
cabal: ${{ env.CABAL_VERSION }}
ghc: ${{ env.GHC_VERSION }}
config: *ghcup-config
env:
LD: ld
CC: cc
Expand All @@ -427,9 +421,6 @@ jobs:
sudo tzsetup Etc/GMT
sudo adjkerntz -a

- name: Add extra-lib-dirs
run: *extra-lib-dirs

- name: Install emscripten
run : |
sudo pkg install -y emscripten
Expand All @@ -439,11 +430,9 @@ jobs:
which ghc
ghc --info
cabal update
gmake CABAL=$PWD/_build/stage0/bin/cabal _build/bindist/haskell-toolchain.tar.gz _build/bindist/tests.tar.gz
gmake _build/bindist/ghc.tar.gz _build/bindist/ghc-javascript-unknown-ghcjs.tar.gz _build/bindist/tests.tar.gz
cd _build/bindist
mv ghc.tar.gz ghc-$(bin/ghc --numeric-version)-${{ env.ARTIFACT }}.tar.gz
mv cabal.tar.gz cabal-$(bin/cabal --numeric-version)-${{ env.ARTIFACT }}.tar.gz
mv haskell-toolchain.tar.gz haskell-toolchain-${{ env.ARTIFACT }}.tar.gz
mv ghc-javascript-unknown-ghcjs.tar.gz ghc-javascript-unknown-ghcjs-$(bin/ghc --numeric-version)-${{ env.ARTIFACT }}.tar.gz
mv tests.tar.gz tests-${{ env.ARTIFACT }}.tar.gz
env:
Expand Down Expand Up @@ -677,7 +666,6 @@ jobs:
- uses: actions/checkout@v4
with:
ref: ${{ matrix.branch }}
submodules: recursive

- uses: ./.github/actions/download
with:
Expand Down Expand Up @@ -707,7 +695,6 @@ jobs:
- uses: actions/checkout@v4
with:
ref: ${{ matrix.branch }}
submodules: recursive

- name: Install msys2 dependencies
run: *msys2-install
Expand Down
Loading
Loading