From 983414d1fe175396650a69a54b734a137de00d91 Mon Sep 17 00:00:00 2001 From: michaelwebb76 Date: Wed, 29 Oct 2025 12:07:20 +0000 Subject: [PATCH 1/2] workflow update from gha-workflows --- .github/workflows/haskell-ci.yml | 384 ++++++++++++++++--------------- 1 file changed, 196 insertions(+), 188 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 29dff09..fbedb81 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -1,208 +1,216 @@ -# This file is generated by `generate.sh`. -# Generated from https://github.com/bellroy/gha-workflows/tree/master/dhall/workflows/github-actions/haskell-ci.dhall +# This file is generated by `bellroy-github-actions`. # Think twice before editing it directly. jobs: generate-matrix: name: Generate matrix from cabal outputs: - matrix: "${{ steps.set-matrix.outputs.matrix }}" + matrix: ${{ steps.set-matrix.outputs.matrix }} runs-on: ubuntu-24.04 steps: - - id: set-matrix - name: Extract the tested GHC versions - uses: "kleidukos/get-tested@a0aa3f2d4ab0d10daa49dc9ee8c706d673fb0e02" - with: - cabal-file: github-actions.cabal - ubuntu-version: '24.04' - version: '0.1.7.1' + - id: set-matrix + name: Extract the tested GHC versions + uses: kleidukos/get-tested@a0aa3f2d4ab0d10daa49dc9ee8c706d673fb0e02 + with: + cabal-file: github-actions.cabal + ubuntu-version: '24.04' + version: 0.1.7.1 timeout-minutes: 30 tests: container: image: buildpack-deps:jammy - name: "${{ matrix.ghc }} on ${{ matrix.os }}" + name: ${{ matrix.ghc }} on ${{ matrix.os }} needs: - - generate-matrix - runs-on: "${{ matrix.os }}" + - generate-matrix + runs-on: ${{ matrix.os }} steps: - - env: - HCKIND: ghc - HCNAME: "ghc-${{ matrix.ghc }}" - HCVER: "${{ matrix.ghc }}" - name: apt - run: | - apt-get update - apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 - mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.50.2/x86_64-linux-ghcup-0.1.50.2 > "$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 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false) - - env: - HCKIND: ghc - HCNAME: "ghc-${{ matrix.ghc }}" - HCVER: "${{ matrix.ghc }}" - name: Set PATH and environment variables - run: | - echo "$HOME/.cabal/bin" >> $GITHUB_PATH - echo "LANG=C.UTF-8" >> "$GITHUB_ENV" - echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV" - echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV" - HCDIR=/opt/$HCKIND/$HCVER - HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER") - HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#') - HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#') - echo "HC=$HC" >> "$GITHUB_ENV" - echo "HCPKG=$HCPKG" >> "$GITHUB_ENV" - echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV" - echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV" - HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))') - echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV" - echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" - echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV" - echo "HEADHACKAGE=false" >> "$GITHUB_ENV" - echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV" - 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 - - if: "always()" - name: "save cache (tools)" - uses: "actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830" - with: - key: "${{ runner.os }}-${{ matrix.ghc }}-tools-ac1dc7e1" - path: "~/.haskell-ci-tools" - - name: checkout - uses: "actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11" - 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 '.*/github-actions-[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 github-actions" >> 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 - uses: "actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830" - 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 -XHaskell2010 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 - - if: "always()" - name: save cache - uses: "actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830" - with: - key: "${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }}" - path: "~/.cabal/store" + - env: + CABAL_VERSION: 3.14.2.0 + GHCUP_VERSION: 0.1.50.2 + HCKIND: ghc + HCNAME: ghc-${{ matrix.ghc }} + HCVER: ${{ matrix.ghc }} + name: apt + run: | + apt-get update + apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common 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) + - env: + CABAL_VERSION: 3.14.2.0 + GHCUP_VERSION: 0.1.50.2 + HCKIND: ghc + HCNAME: ghc-${{ matrix.ghc }} + HCVER: ${{ matrix.ghc }} + name: Set PATH and environment variables + run: | + echo "$HOME/.cabal/bin" >> $GITHUB_PATH + echo "LANG=C.UTF-8" >> "$GITHUB_ENV" + echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV" + echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV" + HCDIR=/opt/$HCKIND/$HCVER + HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER") + HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#') + HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#') + echo "HC=$HC" >> "$GITHUB_ENV" + echo "HCPKG=$HCPKG" >> "$GITHUB_ENV" + echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV" + echo "CABAL=$HOME/.ghcup/bin/cabal-$CABAL_VERSION -vnormal+nowrap" >> "$GITHUB_ENV" + HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))') + echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV" + echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" + echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV" + echo "HEADHACKAGE=false" >> "$GITHUB_ENV" + echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV" + 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 + - if: always() + name: save cache (~/.haskell-ci-tools) + uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 + with: + key: ${{ runner.os }}-${{ matrix.ghc }}-tools-ac1dc7e1 + path: ~/.haskell-ci-tools + - name: checkout + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 + 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 {} \; + - env: + CABAL_FILE_RELATIVE_PATH_NO_EXTENSION: github-actions + 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@0057852bfaa89a56745cba8c7296529d2fc39830 + with: + key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }} + path: ~/.cabal/store + - 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 + - env: + LANGUAGE_EDITION: Haskell2010 + 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 + - if: always() + name: save cache (~/.cabal/store) + uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 + with: + key: ${{ runner.os }}-${{ matrix.ghc }}-${{ github.sha }} + path: ~/.cabal/store strategy: matrix: include: - - "${{ (fromJSON(needs.generate-matrix.outputs.matrix)).include }}" + - ${{ (fromJSON(needs.generate-matrix.outputs.matrix)).include }} timeout-minutes: 30 name: Haskell CI -on: +'on': push: branches-ignore: - - "refs/tags/*_staging" - - "refs/tags/*_production" + - refs/tags/*_staging + - refs/tags/*_production From f4f6e2c5a4231fe5db9cb25f5f1f56429750405f Mon Sep 17 00:00:00 2001 From: michaelwebb76 Date: Thu, 30 Oct 2025 04:27:48 +0000 Subject: [PATCH 2/2] workflow update from gha-workflows --- .github/workflows/haskell-ci.yml | 34 +++++++++++++------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index fbedb81..3230d88 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -1,5 +1,10 @@ # This file is generated by `bellroy-github-actions`. # Think twice before editing it directly. +env: + CABAL_FILE_RELATIVE_PATH_NO_EXTENSION: github-actions + CABAL_VERSION: 3.14.2.0 + GHCUP_VERSION: 0.1.50.2 + LANGUAGE_EDITION: Haskell2010 jobs: generate-matrix: name: Generate matrix from cabal @@ -18,18 +23,16 @@ jobs: tests: container: image: buildpack-deps:jammy + env: + HCKIND: ghc + HCNAME: ghc-${{ matrix.ghc }} + HCVER: ${{ matrix.ghc }} name: ${{ matrix.ghc }} on ${{ matrix.os }} needs: - generate-matrix runs-on: ${{ matrix.os }} steps: - - env: - CABAL_VERSION: 3.14.2.0 - GHCUP_VERSION: 0.1.50.2 - HCKIND: ghc - HCNAME: ghc-${{ matrix.ghc }} - HCVER: ${{ matrix.ghc }} - name: apt + - name: apt run: | apt-get update apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 @@ -38,13 +41,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) - - env: - CABAL_VERSION: 3.14.2.0 - GHCUP_VERSION: 0.1.50.2 - HCKIND: ghc - HCNAME: ghc-${{ matrix.ghc }} - HCVER: ${{ matrix.ghc }} - name: Set PATH and environment variables + - name: Set PATH and environment variables run: | echo "$HOME/.cabal/bin" >> $GITHUB_PATH echo "LANG=C.UTF-8" >> "$GITHUB_ENV" @@ -141,9 +138,7 @@ jobs: run: | mkdir -p unpacked find sdist -maxdepth 1 -type f -name '*.tar.gz' -exec tar -C $GITHUB_WORKSPACE/unpacked -xzvf {} \; - - env: - CABAL_FILE_RELATIVE_PATH_NO_EXTENSION: github-actions - name: generate cabal.project + - 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" @@ -167,6 +162,7 @@ jobs: 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 @@ -180,9 +176,7 @@ jobs: - name: tests run: | $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct - - env: - LANGUAGE_EDITION: Haskell2010 - name: doctest + - name: doctest run: | cd ${PKGDIR_PROJECT} || false doctest -X$LANGUAGE_EDITION src