From 0fac12bfa54536172d26b9a30c31a1c5d49558bc Mon Sep 17 00:00:00 2001 From: adreasnow Date: Mon, 4 May 2026 18:01:40 +1000 Subject: [PATCH 1/5] Big workflow readbility improvements --- .github/workflows/haskell-ci.yml | 52 ++++++++++++++++---------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 6f499b3..a815166 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -1,38 +1,49 @@ # This file is generated by `bellroy-github-actions`. # Think twice before editing it directly. +name: Haskell CI +on: + push: + branches-ignore: + - refs/tags/*_staging + - refs/tags/*_production env: CABAL_FILE_RELATIVE_PATH_NO_EXTENSION: github-actions - CABAL_VERSION: 3.16.0.0 - GHCUP_VERSION: 0.1.50.2 + CABAL_VERSION: '3.16.0.0' + GHCUP_VERSION: '0.1.50.2' LANG: C.UTF-8 LANGUAGE_EDITION: Haskell2010 LC_ALL: C.UTF-8 jobs: generate-matrix: name: Generate matrix from cabal + runs-on: ubuntu-24.04 + timeout-minutes: 30.0 outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} - runs-on: ubuntu-24.04 steps: - - id: set-matrix - name: Extract the tested GHC versions + - name: Extract the tested GHC versions + id: set-matrix uses: kleidukos/get-tested@a55a250eac23bcc4bcd1cb22d77be61baea5a7e2 with: cabal-file: github-actions.cabal ubuntu-version: '24.04' - version: 0.1.7.1 - timeout-minutes: 30 + version: '0.1.7.1' tests: + name: ${{ matrix.ghc }} on ${{ matrix.os }} + runs-on: ${{ matrix.os }} + needs: + - generate-matrix + timeout-minutes: 30.0 container: image: buildpack-deps:jammy + strategy: + matrix: + include: + - ${{ (fromJSON(needs.generate-matrix.outputs.matrix)).include }} env: HCKIND: ghc HCNAME: ghc-${{ matrix.ghc }} HCVER: ${{ matrix.ghc }} - name: ${{ matrix.ghc }} on ${{ matrix.os }} - needs: - - generate-matrix - runs-on: ${{ matrix.os }} steps: - name: apt run: | @@ -120,8 +131,8 @@ jobs: run: | $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.24.0' doctest --version - - if: always() - name: save cache (~/.haskell-ci-tools) + - name: save cache (~/.haskell-ci-tools) + if: always() uses: actions/cache/save@v5 with: key: ${{ runner.os }}-${{ matrix.ghc }}-tools-ac1dc7e1 @@ -196,20 +207,9 @@ jobs: run: | rm -f cabal.project.local $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all - - if: always() - name: save cache (~/.cabal/store) + - name: save cache (~/.cabal/store) + if: always() uses: actions/cache/save@v5 with: key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }} path: ~/.cabal/store - strategy: - matrix: - include: - - ${{ (fromJSON(needs.generate-matrix.outputs.matrix)).include }} - timeout-minutes: 30 -name: Haskell CI -'on': - push: - branches-ignore: - - refs/tags/*_staging - - refs/tags/*_production From cb6843ac10b701937bb02b416e8d60ad0a865077 Mon Sep 17 00:00:00 2001 From: adreasnow Date: Mon, 4 May 2026 19:26:09 +1000 Subject: [PATCH 2/5] Add spaces between top level items --- .github/workflows/haskell-ci.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index a815166..d57d643 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -1,11 +1,13 @@ # This file is generated by `bellroy-github-actions`. # Think twice before editing it directly. name: Haskell CI + on: push: branches-ignore: - refs/tags/*_staging - refs/tags/*_production + env: CABAL_FILE_RELATIVE_PATH_NO_EXTENSION: github-actions CABAL_VERSION: '3.16.0.0' @@ -13,6 +15,7 @@ env: LANG: C.UTF-8 LANGUAGE_EDITION: Haskell2010 LC_ALL: C.UTF-8 + jobs: generate-matrix: name: Generate matrix from cabal @@ -28,6 +31,7 @@ jobs: cabal-file: github-actions.cabal ubuntu-version: '24.04' version: '0.1.7.1' + tests: name: ${{ matrix.ghc }} on ${{ matrix.os }} runs-on: ${{ matrix.os }} @@ -54,6 +58,7 @@ jobs: chmod a+x "$HOME/.ghcup/bin/ghcup" "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) "$HOME/.ghcup/bin/ghcup" install cabal $CABAL_VERSION || (cat "$HOME"/.ghcup/logs/*.* && false) + - name: Set PATH and environment variables run: | echo "$HOME/.cabal/bin" >> $GITHUB_PATH @@ -78,9 +83,11 @@ jobs: echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" echo "GHCJSARITH=0" } >> $GITHUB_ENV + - name: env run: | env + - name: write cabal config run: | mkdir -p $CABAL_DIR @@ -105,19 +112,23 @@ jobs: ghc-options: $GHCJOBS +RTS -M3G -RTS EOF cat $CABAL_CONFIG + - name: versions run: | $HC --version || true $HC --print-project-git-commit-id || true $CABAL --version || true + - name: update cabal index run: | $CABAL v2-update -v + - name: restore cache (~/.haskell-ci-tools) uses: actions/cache/restore@v5 with: key: ${{ runner.os }}-${{ matrix.ghc }}-tools-ac1dc7e1 path: ~/.haskell-ci-tools + - name: install cabal-plan run: | mkdir -p $HOME/.cabal/bin @@ -127,33 +138,40 @@ jobs: rm -f cabal-plan.xz chmod a+x $HOME/.cabal/bin/cabal-plan cabal-plan --version + - name: install doctest run: | $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.24.0' doctest --version + - name: save cache (~/.haskell-ci-tools) if: always() uses: actions/cache/save@v5 with: key: ${{ runner.os }}-${{ matrix.ghc }}-tools-ac1dc7e1 path: ~/.haskell-ci-tools + - name: checkout uses: actions/checkout@v6 with: path: source + - name: initial cabal.project for sdist run: | touch cabal.project echo "packages: $GITHUB_WORKSPACE/source/." >> cabal.project cat cabal.project + - name: sdist run: | mkdir -p sdist $CABAL sdist all --output-dir $GITHUB_WORKSPACE/sdist + - name: unpack run: | mkdir -p unpacked find sdist -maxdepth 1 -type f -name '*.tar.gz' -exec tar -C $GITHUB_WORKSPACE/unpacked -xzvf {} \; + - name: generate cabal.project run: | PKGDIR_PROJECT="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*\/'$CABAL_FILE_RELATIVE_PATH_NO_EXTENSION'-[0-9.]*')" @@ -169,44 +187,55 @@ jobs: $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^('$CABAL_FILE_RELATIVE_PATH_NO_EXTENSION')$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local + - name: dump install plan run: | $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all cabal-plan + - name: restore cache (~/.cabal/store) uses: actions/cache/restore@v5 with: key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }} path: ~/.cabal/store restore-keys: ${{ runner.os }}-${{ matrix.ghc }}- + - name: install dependencies run: | $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dependencies-only -j2 all + - name: build w/o tests run: | $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all + - name: build run: | $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always + - name: tests run: | $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct + - name: doctest run: | cd ${PKGDIR_PROJECT} || false doctest -X$LANGUAGE_EDITION src + - name: cabal check run: | cd ${PKGDIR_PROJECT} || false ${CABAL} -vnormal check + - name: haddock run: | $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all + - name: unconstrained build run: | rm -f cabal.project.local $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all + - name: save cache (~/.cabal/store) if: always() uses: actions/cache/save@v5 From 8b8d8bef49987d1c9cc4f1de559c483defa965cd Mon Sep 17 00:00:00 2001 From: adreasnow Date: Mon, 4 May 2026 19:49:43 +1000 Subject: [PATCH 3/5] fodmat integers correctly and indent lists --- .github/workflows/haskell-ci.yml | 408 +++++++++++++++---------------- 1 file changed, 204 insertions(+), 204 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index d57d643..9c4993b 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -5,8 +5,8 @@ name: Haskell CI on: push: branches-ignore: - - refs/tags/*_staging - - refs/tags/*_production + - refs/tags/*_staging + - refs/tags/*_production env: CABAL_FILE_RELATIVE_PATH_NO_EXTENSION: github-actions @@ -24,221 +24,221 @@ jobs: outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: - - name: Extract the tested GHC versions - id: set-matrix - uses: kleidukos/get-tested@a55a250eac23bcc4bcd1cb22d77be61baea5a7e2 - with: - cabal-file: github-actions.cabal - ubuntu-version: '24.04' - version: '0.1.7.1' + - name: Extract the tested GHC versions + id: set-matrix + uses: kleidukos/get-tested@a55a250eac23bcc4bcd1cb22d77be61baea5a7e2 + with: + cabal-file: github-actions.cabal + ubuntu-version: '24.04' + version: '0.1.7.1' tests: name: ${{ matrix.ghc }} on ${{ matrix.os }} runs-on: ${{ matrix.os }} needs: - - generate-matrix + - generate-matrix timeout-minutes: 30.0 container: image: buildpack-deps:jammy strategy: matrix: include: - - ${{ (fromJSON(needs.generate-matrix.outputs.matrix)).include }} + - ${{ (fromJSON(needs.generate-matrix.outputs.matrix)).include }} env: HCKIND: ghc HCNAME: ghc-${{ matrix.ghc }} HCVER: ${{ matrix.ghc }} steps: - - name: apt - run: | - apt-get update - apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git libtinfo5 - mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/$GHCUP_VERSION/x86_64-linux-ghcup-$GHCUP_VERSION > "$HOME/.ghcup/bin/ghcup" - chmod a+x "$HOME/.ghcup/bin/ghcup" - "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) - "$HOME/.ghcup/bin/ghcup" install cabal $CABAL_VERSION || (cat "$HOME"/.ghcup/logs/*.* && false) - - - name: Set PATH and environment variables - run: | - echo "$HOME/.cabal/bin" >> $GITHUB_PATH - - HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER") - HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#') - HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#') - HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))') - - { - echo "LANG=C.UTF-8" - echo "CABAL_DIR=$HOME/.cabal" - echo "CABAL_CONFIG=$HOME/.cabal/config" - echo "HC=$HC" - echo "HCPKG=$HCPKG" - echo "HADDOCK=$HADDOCK" - echo "CABAL=$HOME/.ghcup/bin/cabal-$CABAL_VERSION -vnormal+nowrap" - echo "HCNUMVER=$HCNUMVER" - echo "ARG_TESTS=--enable-tests" - echo "ARG_BENCH=--enable-benchmarks" - echo "HEADHACKAGE=false" - echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" - echo "GHCJSARITH=0" - } >> $GITHUB_ENV - - - name: env - run: | - env - - - name: write cabal config - run: | - mkdir -p $CABAL_DIR - cat >> $CABAL_CONFIG <> $CABAL_CONFIG < cabal-plan.xz - echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c - - xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan - rm -f cabal-plan.xz - chmod a+x $HOME/.cabal/bin/cabal-plan - cabal-plan --version - - - name: install doctest - run: | - $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.24.0' - doctest --version - - - name: save cache (~/.haskell-ci-tools) - if: always() - uses: actions/cache/save@v5 - with: - key: ${{ runner.os }}-${{ matrix.ghc }}-tools-ac1dc7e1 - path: ~/.haskell-ci-tools - - - name: checkout - uses: actions/checkout@v6 - with: - path: source - - - name: initial cabal.project for sdist - run: | - touch cabal.project - echo "packages: $GITHUB_WORKSPACE/source/." >> cabal.project - cat cabal.project - - - name: sdist - run: | - mkdir -p sdist - $CABAL sdist all --output-dir $GITHUB_WORKSPACE/sdist - - - name: unpack - run: | - mkdir -p unpacked - find sdist -maxdepth 1 -type f -name '*.tar.gz' -exec tar -C $GITHUB_WORKSPACE/unpacked -xzvf {} \; - - - name: generate cabal.project - run: | - PKGDIR_PROJECT="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*\/'$CABAL_FILE_RELATIVE_PATH_NO_EXTENSION'-[0-9.]*')" - echo "PKGDIR_PROJECT=${PKGDIR_PROJECT}" >> "$GITHUB_ENV" - rm -f cabal.project cabal.project.local - touch cabal.project - touch cabal.project.local - echo "packages: ${PKGDIR_PROJECT}" >> cabal.project - echo "package $CABAL_FILE_RELATIVE_PATH_NO_EXTENSION" >> cabal.project - echo " ghc-options: -Werror=missing-methods" >> cabal.project - cat >> cabal.project <> cabal.project.local - cat cabal.project - cat cabal.project.local - - - name: dump install plan - run: | - $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all - cabal-plan - - - name: restore cache (~/.cabal/store) - uses: actions/cache/restore@v5 - with: - key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }} - path: ~/.cabal/store - restore-keys: ${{ runner.os }}-${{ matrix.ghc }}- - - - name: install dependencies - run: | - $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all - $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dependencies-only -j2 all - - - name: build w/o tests - run: | - $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all - - - name: build - run: | - $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always - - - name: tests - run: | - $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct - - - name: doctest - run: | - cd ${PKGDIR_PROJECT} || false - doctest -X$LANGUAGE_EDITION src - - - name: cabal check - run: | - cd ${PKGDIR_PROJECT} || false - ${CABAL} -vnormal check - - - name: haddock - run: | - $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all - - - name: unconstrained build - run: | - rm -f cabal.project.local - $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all - - - name: save cache (~/.cabal/store) - if: always() - uses: actions/cache/save@v5 - with: - key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }} - path: ~/.cabal/store + - name: apt + run: | + apt-get update + apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git libtinfo5 + mkdir -p "$HOME/.ghcup/bin" + curl -sL https://downloads.haskell.org/ghcup/$GHCUP_VERSION/x86_64-linux-ghcup-$GHCUP_VERSION > "$HOME/.ghcup/bin/ghcup" + chmod a+x "$HOME/.ghcup/bin/ghcup" + "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) + "$HOME/.ghcup/bin/ghcup" install cabal $CABAL_VERSION || (cat "$HOME"/.ghcup/logs/*.* && false) + + - name: Set PATH and environment variables + run: | + echo "$HOME/.cabal/bin" >> $GITHUB_PATH + + HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER") + HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#') + HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#') + HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))') + + { + echo "LANG=C.UTF-8" + echo "CABAL_DIR=$HOME/.cabal" + echo "CABAL_CONFIG=$HOME/.cabal/config" + echo "HC=$HC" + echo "HCPKG=$HCPKG" + echo "HADDOCK=$HADDOCK" + echo "CABAL=$HOME/.ghcup/bin/cabal-$CABAL_VERSION -vnormal+nowrap" + echo "HCNUMVER=$HCNUMVER" + echo "ARG_TESTS=--enable-tests" + echo "ARG_BENCH=--enable-benchmarks" + echo "HEADHACKAGE=false" + echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" + echo "GHCJSARITH=0" + } >> $GITHUB_ENV + + - name: env + run: | + env + + - name: write cabal config + run: | + mkdir -p $CABAL_DIR + cat >> $CABAL_CONFIG <> $CABAL_CONFIG < cabal-plan.xz + echo 'f62ccb2971567a5f638f2005ad3173dba14693a45154c1508645c52289714cb2 cabal-plan.xz' | sha256sum -c - + xz -d < cabal-plan.xz > $HOME/.cabal/bin/cabal-plan + rm -f cabal-plan.xz + chmod a+x $HOME/.cabal/bin/cabal-plan + cabal-plan --version + + - name: install doctest + run: | + $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.24.0' + doctest --version + + - name: save cache (~/.haskell-ci-tools) + if: always() + uses: actions/cache/save@v5 + with: + key: ${{ runner.os }}-${{ matrix.ghc }}-tools-ac1dc7e1 + path: ~/.haskell-ci-tools + + - name: checkout + uses: actions/checkout@v6 + with: + path: source + + - name: initial cabal.project for sdist + run: | + touch cabal.project + echo "packages: $GITHUB_WORKSPACE/source/." >> cabal.project + cat cabal.project + + - name: sdist + run: | + mkdir -p sdist + $CABAL sdist all --output-dir $GITHUB_WORKSPACE/sdist + + - name: unpack + run: | + mkdir -p unpacked + find sdist -maxdepth 1 -type f -name '*.tar.gz' -exec tar -C $GITHUB_WORKSPACE/unpacked -xzvf {} \; + + - name: generate cabal.project + run: | + PKGDIR_PROJECT="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*\/'$CABAL_FILE_RELATIVE_PATH_NO_EXTENSION'-[0-9.]*')" + echo "PKGDIR_PROJECT=${PKGDIR_PROJECT}" >> "$GITHUB_ENV" + rm -f cabal.project cabal.project.local + touch cabal.project + touch cabal.project.local + echo "packages: ${PKGDIR_PROJECT}" >> cabal.project + echo "package $CABAL_FILE_RELATIVE_PATH_NO_EXTENSION" >> cabal.project + echo " ghc-options: -Werror=missing-methods" >> cabal.project + cat >> cabal.project <> cabal.project.local + cat cabal.project + cat cabal.project.local + + - name: dump install plan + run: | + $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all + cabal-plan + + - name: restore cache (~/.cabal/store) + uses: actions/cache/restore@v5 + with: + key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }} + path: ~/.cabal/store + restore-keys: ${{ runner.os }}-${{ matrix.ghc }}- + + - name: install dependencies + run: | + $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --dependencies-only -j2 all + $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dependencies-only -j2 all + + - name: build w/o tests + run: | + $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all + + - name: build + run: | + $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --write-ghc-environment-files=always + + - name: tests + run: | + $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct + + - name: doctest + run: | + cd ${PKGDIR_PROJECT} || false + doctest -X$LANGUAGE_EDITION src + + - name: cabal check + run: | + cd ${PKGDIR_PROJECT} || false + ${CABAL} -vnormal check + + - name: haddock + run: | + $CABAL v2-haddock --disable-documentation --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all + + - name: unconstrained build + run: | + rm -f cabal.project.local + $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all + + - name: save cache (~/.cabal/store) + if: always() + uses: actions/cache/save@v5 + with: + key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }} + path: ~/.cabal/store From e5189199a870105645c04bf6d2aeac1f49ca3efe Mon Sep 17 00:00:00 2001 From: "claude[bot]" <41898282+claude[bot]@users.noreply.github.com> Date: Mon, 4 May 2026 10:11:52 +0000 Subject: [PATCH 4/5] Fix integer rendering and restore bullet points in Slack DMs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Use floatingOrInteger in numberToScalarEvent so integers render as '30' instead of '30.0' in generated YAML - Restore '•' bullet character in Slack DM notifications; '-' does not render as a bullet in Slack mrkdwn Co-authored-by: Adrea Snow --- .github/workflows/haskell-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 9c4993b..acb733c 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -20,7 +20,7 @@ jobs: generate-matrix: name: Generate matrix from cabal runs-on: ubuntu-24.04 - timeout-minutes: 30.0 + timeout-minutes: 30 outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: @@ -37,7 +37,7 @@ jobs: runs-on: ${{ matrix.os }} needs: - generate-matrix - timeout-minutes: 30.0 + timeout-minutes: 30 container: image: buildpack-deps:jammy strategy: From 1779966b6a7386b42e6bf8d08ea73287daf70c06 Mon Sep 17 00:00:00 2001 From: adreasnow Date: Mon, 4 May 2026 20:46:09 +1000 Subject: [PATCH 5/5] Don't quote bools or numbers --- .github/workflows/haskell-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index acb733c..06ae1da 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -10,8 +10,8 @@ on: env: CABAL_FILE_RELATIVE_PATH_NO_EXTENSION: github-actions - CABAL_VERSION: '3.16.0.0' - GHCUP_VERSION: '0.1.50.2' + CABAL_VERSION: 3.16.0.0 + GHCUP_VERSION: 0.1.50.2 LANG: C.UTF-8 LANGUAGE_EDITION: Haskell2010 LC_ALL: C.UTF-8 @@ -29,8 +29,8 @@ jobs: uses: kleidukos/get-tested@a55a250eac23bcc4bcd1cb22d77be61baea5a7e2 with: cabal-file: github-actions.cabal - ubuntu-version: '24.04' - version: '0.1.7.1' + ubuntu-version: 24.04 + version: 0.1.7.1 tests: name: ${{ matrix.ghc }} on ${{ matrix.os }}