From 032226ace679ca2c11a3c6660a1b92b634109981 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Sun, 13 Feb 2022 10:04:19 +0100 Subject: [PATCH 1/5] Generate a more complete CI using haskell-ci Also includes `cabal haddock`. --- .github/workflows/haskell-ci.yml | 231 +++++++++++++++++++++++++++++++ hackage-server.cabal | 2 +- 2 files changed, 232 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/haskell-ci.yml diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml new file mode 100644 index 000000000..3c754297a --- /dev/null +++ b/.github/workflows/haskell-ci.yml @@ -0,0 +1,231 @@ +# This GitHub workflow config has been generated by a script via +# +# haskell-ci 'github' 'hackage-server.cabal' +# +# To regenerate the script (for example after adjusting tested-with) run +# +# haskell-ci regenerate +# +# For more information, see https://github.com/haskell-CI/haskell-ci +# +# version: 0.14.1 +# +# REGENDATA ("0.14.1",["github","hackage-server.cabal"]) +# +name: Haskell-CI +on: + - push + - pull_request +jobs: + irc: + name: Haskell-CI (IRC notification) + runs-on: ubuntu-18.04 + needs: + - linux + if: ${{ always() }} + timeout-minutes: + 10 + strategy: + fail-fast: false + steps: + - name: IRC success notification (irc.libera.chat#hackage) + uses: Gottox/irc-message-action@v1.1 + if: needs.linux.result == 'success' + with: + channel: "#hackage" + message: "\x0313hackage-server\x03/\x0306${{ github.ref }}\x03 \x0314${{ github.sha }}\x03 https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }} The build succeeded." + nickname: github-actions + server: irc.libera.chat + - name: IRC failure notification (irc.libera.chat#hackage) + uses: Gottox/irc-message-action@v1.1 + if: needs.linux.result != 'success' + with: + channel: "#hackage" + message: "\x0313hackage-server\x03/\x0306${{ github.ref }}\x03 \x0314${{ github.sha }}\x03 https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }} The build failed." + nickname: github-actions + server: irc.libera.chat + linux: + name: Haskell-CI - Linux - ${{ matrix.compiler }} + runs-on: ubuntu-18.04 + timeout-minutes: + 60 + container: + image: buildpack-deps:bionic + continue-on-error: ${{ matrix.allow-failure }} + strategy: + matrix: + include: + - compiler: ghc-8.10.7 + compilerKind: ghc + compilerVersion: 8.10.7 + setup-method: ghcup + allow-failure: false + - compiler: ghc-8.8.4 + compilerKind: ghc + compilerVersion: 8.8.4 + setup-method: hvr-ppa + allow-failure: false + fail-fast: false + steps: + - name: apt + run: | + apt-get update + apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 + if [ "${{ matrix.setup-method }}" = ghcup ]; then + mkdir -p "$HOME/.ghcup/bin" + curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup" + chmod a+x "$HOME/.ghcup/bin/ghcup" + "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" + "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 + else + apt-add-repository -y 'ppa:hvr/ghc' + apt-get update + apt-get install -y "$HCNAME" + mkdir -p "$HOME/.ghcup/bin" + curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup" + chmod a+x "$HOME/.ghcup/bin/ghcup" + "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 + fi + env: + HCKIND: ${{ matrix.compilerKind }} + HCNAME: ${{ matrix.compiler }} + HCVER: ${{ matrix.compilerVersion }} + - 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 + if [ "${{ matrix.setup-method }}" = ghcup ]; then + HC=$HOME/.ghcup/bin/$HCKIND-$HCVER + echo "HC=$HC" >> "$GITHUB_ENV" + echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV" + echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV" + echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV" + else + HC=$HCDIR/bin/$HCKIND + echo "HC=$HC" >> "$GITHUB_ENV" + echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV" + echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV" + echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV" + fi + + 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" + env: + HCKIND: ${{ matrix.compilerKind }} + HCNAME: ${{ matrix.compiler }} + HCVER: ${{ matrix.compilerVersion }} + - name: env + run: | + env + - name: write cabal config + run: | + mkdir -p $CABAL_DIR + cat >> $CABAL_CONFIG <> $CABAL_CONFIG < cabal-plan.xz + echo 'de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc 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: checkout + uses: actions/checkout@v2 + 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_hackage_server="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/hackage-server-[0-9.]*')" + echo "PKGDIR_hackage_server=${PKGDIR_hackage_server}" >> "$GITHUB_ENV" + rm -f cabal.project cabal.project.local + touch cabal.project + touch cabal.project.local + echo "packages: ${PKGDIR_hackage_server}" >> cabal.project + echo "package hackage-server" >> 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: cache + uses: actions/cache@v2 + with: + key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} + path: ~/.cabal/store + restore-keys: ${{ runner.os }}-${{ matrix.compiler }}- + - 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: cabal check + run: | + cd ${PKGDIR_hackage_server} || false + ${CABAL} -vnormal check + - name: unconstrained build + run: | + rm -f cabal.project.local + $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all diff --git a/hackage-server.cabal b/hackage-server.cabal index b8474aa0b..752180265 100644 --- a/hackage-server.cabal +++ b/hackage-server.cabal @@ -27,7 +27,7 @@ copyright: 2008-2015 Duncan Coutts, license: BSD-3-Clause license-file: LICENSE -tested-with: GHC == { 8.10.5, 8.8.4 } +tested-with: GHC == { 8.10.7, 8.8.4 } data-dir: datafiles data-files: From 598be1eeaa3b81f9d7ddcad658b6209f19136e2a Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Sun, 13 Feb 2022 10:31:53 +0100 Subject: [PATCH 2/5] Manually add libbrotli-dev --- .github/workflows/haskell-ci.yml | 30 +------- .travis.yml | 125 ------------------------------- cabal.haskell-ci | 12 ++- 3 files changed, 11 insertions(+), 156 deletions(-) delete mode 100644 .travis.yml diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 3c754297a..f594067ef 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -17,40 +17,13 @@ on: - push - pull_request jobs: - irc: - name: Haskell-CI (IRC notification) - runs-on: ubuntu-18.04 - needs: - - linux - if: ${{ always() }} - timeout-minutes: - 10 - strategy: - fail-fast: false - steps: - - name: IRC success notification (irc.libera.chat#hackage) - uses: Gottox/irc-message-action@v1.1 - if: needs.linux.result == 'success' - with: - channel: "#hackage" - message: "\x0313hackage-server\x03/\x0306${{ github.ref }}\x03 \x0314${{ github.sha }}\x03 https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }} The build succeeded." - nickname: github-actions - server: irc.libera.chat - - name: IRC failure notification (irc.libera.chat#hackage) - uses: Gottox/irc-message-action@v1.1 - if: needs.linux.result != 'success' - with: - channel: "#hackage" - message: "\x0313hackage-server\x03/\x0306${{ github.ref }}\x03 \x0314${{ github.sha }}\x03 https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }} The build failed." - nickname: github-actions - server: irc.libera.chat linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} runs-on: ubuntu-18.04 timeout-minutes: 60 container: - image: buildpack-deps:bionic + image: buildpack-deps:focal continue-on-error: ${{ matrix.allow-failure }} strategy: matrix: @@ -70,6 +43,7 @@ jobs: - name: apt run: | apt-get update + apt-get install -y --no-install-recommends libbrotli-dev apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 if [ "${{ matrix.setup-method }}" = ghcup ]; then mkdir -p "$HOME/.ghcup/bin" diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 65779e412..000000000 --- a/.travis.yml +++ /dev/null @@ -1,125 +0,0 @@ -# This Travis job script has been generated by a script via -# -# haskell-ci '--output=.travis.yml' '--config=cabal.haskell-ci' 'cabal.project' -# -# For more information, see https://github.com/haskell-CI/haskell-ci -# -# version: 0.3 -# -language: c -dist: xenial - -git: - submodules: false # whether to recursively clone submodules - -notifications: - irc: - channels: - - "irc.libera.chat#hackage" - skip_join: true - template: - - "\x0313hackage-server\x03/\x0306%{branch}\x03 \x0314%{commit}\x03 %{build_url} %{message}" - -cache: - directories: - - $HOME/.cabal/packages - - $HOME/.cabal/store - -before_cache: - - rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log - # remove files that are regenerated by 'cabal update' - - rm -fv $CABALHOME/packages/hackage.haskell.org/00-index.* - - rm -fv $CABALHOME/packages/hackage.haskell.org/*.json - - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache - - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar - - rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx - - - rm -rfv $CABALHOME/packages/head.hackage - -matrix: - include: - - compiler: "ghc-8.10.4" - addons: {apt: {packages: [ghc-ppa-tools,cabal-install-3.2,ghc-8.10.4], sources: [hvr-ghc]}} - - compiler: "ghc-8.8.3" - addons: {apt: {packages: [ghc-ppa-tools,cabal-install-3.2,ghc-8.8.3], sources: [hvr-ghc]}} - - allow_failures: - - compiler: "ghc-8.8.3" - -before_install: - - HC=/opt/ghc/bin/${CC} - - HCPKG=${HC/ghc/ghc-pkg} - - unset CC - - CABAL=/opt/ghc/bin/cabal - - CABALHOME=$HOME/.cabal - - export PATH="$CABALHOME/bin:$PATH" - - ROOTDIR=$(pwd) - - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') )) - - echo $HCNUMVER - - sudo apt-get -y install libbrotli-dev - -install: - - ${CABAL} --version - - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]" - - TEST=--enable-tests - - BENCH=--enable-benchmarks - - GHCHEAD=${GHCHEAD-false} - - travis_retry ${CABAL} update -v - - sed -i.bak 's/^jobs:/-- jobs:/' $CABALHOME/config - - rm -fv cabal.project cabal.project.local - - grep -Ev -- '^\s*--' $CABALHOME/config | grep -Ev '^\s*$' - - rm -f cabal.project - - touch cabal.project - - "printf 'packages: \".\"\\n' >> cabal.project" - - "echo 'constraints: foundation -none' >> cabal.project" - - "echo 'constraints: cryptonite -none' >> cabal.project" - - "echo 'constraints: cryptohash -none' >> cabal.project" - - "printf 'write-ghc-environment-files: always\\n' >> cabal.project" - - touch cabal.project.local - - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(hackage-server)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done" - - cat cabal.project || true - - cat cabal.project.local || true - - if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi - - rm -f cabal.project.freeze - - ${CABAL} freeze -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dry - - "cat \"cabal.project.freeze\" | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'" - - rm "cabal.project.freeze" - - ${CABAL} build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all - - ${CABAL} build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all - - rm -rf .ghc.environment.* "."/dist - - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX) - -# Here starts the actual work to be performed for the package under test; -# any command which exits with a non-zero exit code causes the build to fail. -script: - # test that source-distributions can be generated - - ${CABAL} sdist all - - mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/ - - cd ${DISTDIR} || false - - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \; - - rm -f cabal.project - - touch cabal.project - - "printf 'packages: \"hackage-server-*/*.cabal\"\\n' >> cabal.project" - - "echo 'constraints: foundation -none' >> cabal.project" - - "echo 'constraints: cryptonite -none' >> cabal.project" - - "echo 'constraints: cryptohash -none' >> cabal.project" - - "printf 'write-ghc-environment-files: always\\n' >> cabal.project" - - touch cabal.project.local - - "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(hackage-server)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done" - - cat cabal.project || true - - cat cabal.project.local || true - # this builds all libraries and executables (without tests/benchmarks) - - ${CABAL} build -w ${HC} --disable-tests --disable-benchmarks all - - # build & run tests, build benchmarks - - ${CABAL} build -w ${HC} ${TEST} ${BENCH} all - - ${CABAL} test -w ${HC} ${TEST} ${BENCH} all - - # cabal check - - (cd hackage-server-* && ${CABAL} check) - - # Build without installed constraints for packages in global-db - - rm -f cabal.project.local; ${CABAL} build -w ${HC} --disable-tests --disable-benchmarks all; - -# REGENDATA ["--output=.travis.yml","--config=cabal.haskell-ci","cabal.project"] -# EOF diff --git a/cabal.haskell-ci b/cabal.haskell-ci index 775eda057..4b3e0bb94 100644 --- a/cabal.haskell-ci +++ b/cabal.haskell-ci @@ -1,4 +1,10 @@ -irc-channels: irc.libera.chat#hackage +-- -- irc-channels works with GHA, but why send to a channel +-- -- when one can subscribe to github notifications? +-- irc-channels: irc.libera.chat#hackage --- allow failures with ghc-7.6 and ghc-7.8 -allow-failures: <7.9 +-- Does not work with GHA: +-- -- allow failures with ghc-7.6 and ghc-7.8 +-- allow-failures: <7.9 + +-- Use Ubuntu 20.04 +distribution: focal \ No newline at end of file From cd7f9d4edf1155a25b296b0bd68e71aa6006c483 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Sun, 13 Feb 2022 10:32:41 +0100 Subject: [PATCH 3/5] Temporarily remove .github/workflows/ci.yml --- .github/workflows/ci.yml | 66 ---------------------------------------- 1 file changed, 66 deletions(-) delete mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index e26eddd14..000000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,66 +0,0 @@ -# modified from https://github.com/jgm/pandoc/blob/master/.github/workflows/ci.yml -name: CI - -on: - push: - branches: - - '**' - paths-ignore: [] - pull_request: - paths-ignore: [] - -jobs: - linux: - - runs-on: ubuntu-20.04 - strategy: - fail-fast: false - matrix: - versions: - - ghc: '8.10.5' - cabal: '3.4' - - ghc: '8.8.4' - cabal: '3.4' - steps: - - uses: actions/checkout@v2 - - # need to install older cabal/ghc versions from ppa repository - - - name: Install recent cabal/ghc - uses: haskell/actions/setup@v1 - with: - ghc-version: ${{ matrix.versions.ghc }} - cabal-version: ${{ matrix.versions.cabal }} - - # declare/restore cached things - # caching doesn't work for scheduled runs yet - # https://github.com/actions/cache/issues/63 - - - name: Cache cabal global package db - id: cabal-global - uses: actions/cache@v2 - with: - path: | - ~/.cabal - key: ${{ runner.os }}-${{ matrix.versions.ghc }}-${{ matrix.versions.cabal }}-cabal-global-${{ hashFiles('cabal.project') }} - - - name: Cache cabal work - id: cabal-local - uses: actions/cache@v2 - with: - path: | - dist-newstyle - key: ${{ runner.os }}-${{ matrix.versions.ghc }}-${{ matrix.versions.cabal }}-cabal-local - - - name: Install dependencies - run: | - sudo apt-get update - sudo apt-get install libbrotli-dev - cabal update - cabal build --dependencies-only --enable-tests --disable-optimization - - name: Build - run: | - cabal build --enable-tests --disable-optimization 2>&1 | tee build.log - - name: Test - run: | - cabal test --disable-optimization From ef2ccca59d2a811a6c9c333b5ddf72abdc005d27 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Sun, 13 Feb 2022 11:32:11 +0100 Subject: [PATCH 4/5] Makefile to patch haskell-ci.yml --- .github/workflows/Makefile | 19 +++++++++++++++++++ .github/workflows/haskell-ci.patch | 10 ++++++++++ .github/workflows/haskell-ci.yml | 6 +++--- cabal.haskell-ci | 7 ++++++- 4 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/Makefile create mode 100644 .github/workflows/haskell-ci.patch diff --git a/.github/workflows/Makefile b/.github/workflows/Makefile new file mode 100644 index 000000000..0dd6c48fc --- /dev/null +++ b/.github/workflows/Makefile @@ -0,0 +1,19 @@ +# Post-process the haskell-ci.yml file generated by +# $ haskell-ci github hackage-server.cabal +# or +# $ haskell-ci regenerate + +.PHONY: patch-haskell-ci +patch-haskell-ci : haskell-ci.patch Makefile + patch -N --input=haskell-ci.patch haskell-ci.yml + +# Regenerate haskell-ci.patch +# +# $ cp haskell-ci.yml haskell-ci.yml.orig +# ... edit haskell-ci.yml ... +# $ make haskell.ci.patch +# +haskell-ci.patch : haskell-ci.yml.orig haskell-ci.yml + -diff -u haskell-ci.yml.orig haskell-ci.yml > $@ + +# EOF diff --git a/.github/workflows/haskell-ci.patch b/.github/workflows/haskell-ci.patch new file mode 100644 index 000000000..97517e82c --- /dev/null +++ b/.github/workflows/haskell-ci.patch @@ -0,0 +1,10 @@ +--- haskell-ci.yml.orig 2022-02-13 11:28:52.000000000 +0100 ++++ haskell-ci.yml 2022-02-13 11:29:22.000000000 +0100 +@@ -43,6 +43,7 @@ + - name: apt + run: | + apt-get update ++ apt-get install -y --no-install-recommends libbrotli-dev + apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 + if [ "${{ matrix.setup-method }}" = ghcup ]; then + mkdir -p "$HOME/.ghcup/bin" diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index f594067ef..b943346ec 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -1,6 +1,6 @@ # This GitHub workflow config has been generated by a script via # -# haskell-ci 'github' 'hackage-server.cabal' +# haskell-ci 'github' '--haddock' 'hackage-server.cabal' # # To regenerate the script (for example after adjusting tested-with) run # @@ -10,7 +10,7 @@ # # version: 0.14.1 # -# REGENDATA ("0.14.1",["github","hackage-server.cabal"]) +# REGENDATA ("0.14.1",["github","--haddock","hackage-server.cabal"]) # name: Haskell-CI on: @@ -169,7 +169,7 @@ jobs: echo " ghc-options: -Werror=missing-methods" >> cabal.project cat >> cabal.project <> cabal.project.local + $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(Cabal|hackage-server)$/; }' >> cabal.project.local cat cabal.project cat cabal.project.local - name: dump install plan diff --git a/cabal.haskell-ci b/cabal.haskell-ci index 4b3e0bb94..c6d2ab18a 100644 --- a/cabal.haskell-ci +++ b/cabal.haskell-ci @@ -1,3 +1,5 @@ +installed: +all -Cabal + -- -- irc-channels works with GHA, but why send to a channel -- -- when one can subscribe to github notifications? -- irc-channels: irc.libera.chat#hackage @@ -7,4 +9,7 @@ -- allow-failures: <7.9 -- Use Ubuntu 20.04 -distribution: focal \ No newline at end of file +distribution: focal + +-- No effect (haskell-ci 1.14.1): +-- haddock: True \ No newline at end of file From 0330da35184222f3bfc222f36cc1c2fc5335e62c Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Sun, 13 Feb 2022 11:40:37 +0100 Subject: [PATCH 5/5] Add haddock goal to haskell-ci --- .github/workflows/haskell-ci.patch | 12 +++++++++++- .github/workflows/haskell-ci.yml | 3 +++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/haskell-ci.patch b/.github/workflows/haskell-ci.patch index 97517e82c..e023441d3 100644 --- a/.github/workflows/haskell-ci.patch +++ b/.github/workflows/haskell-ci.patch @@ -1,5 +1,5 @@ --- haskell-ci.yml.orig 2022-02-13 11:28:52.000000000 +0100 -+++ haskell-ci.yml 2022-02-13 11:29:22.000000000 +0100 ++++ haskell-ci.yml 2022-02-13 11:37:48.000000000 +0100 @@ -43,6 +43,7 @@ - name: apt run: | @@ -8,3 +8,13 @@ apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5 if [ "${{ matrix.setup-method }}" = ghcup ]; then mkdir -p "$HOME/.ghcup/bin" +@@ -198,6 +199,9 @@ + run: | + cd ${PKGDIR_hackage_server} || false + ${CABAL} -vnormal check ++ - name: haddock ++ run: | ++ $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all + - name: unconstrained build + run: | + rm -f cabal.project.local diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index b943346ec..0db91aec1 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -199,6 +199,9 @@ jobs: run: | cd ${PKGDIR_hackage_server} || false ${CABAL} -vnormal check + - name: haddock + run: | + $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all - name: unconstrained build run: | rm -f cabal.project.local