diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml new file mode 100644 index 00000000..73d151d8 --- /dev/null +++ b/.github/workflows/haskell-ci.yml @@ -0,0 +1,249 @@ +# This GitHub workflow config has been generated by a script via +# +# haskell-ci 'github' '--distribution' 'jammy' '--jobs-selection' 'any' '--submodules' 'cabal.project' +# +# 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.17.20230826 +# +# REGENDATA ("0.17.20230826",["github","--distribution","jammy","--jobs-selection","any","--submodules","cabal.project"]) +# +name: Haskell-CI +on: + - push + - pull_request +jobs: + linux: + name: Haskell-CI - Linux - ${{ matrix.compiler }} + runs-on: ubuntu-20.04 + timeout-minutes: + 60 + container: + image: buildpack-deps:jammy + continue-on-error: ${{ matrix.allow-failure }} + strategy: + matrix: + include: + - compiler: ghc-9.4.7 + compilerKind: ghc + compilerVersion: 9.4.7 + setup-method: ghcup + 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.19.5/x86_64-linux-ghcup-0.1.19.5 > "$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.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + 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.19.5/x86_64-linux-ghcup-0.1.19.5 > "$HOME/.ghcup/bin/ghcup" + chmod a+x "$HOME/.ghcup/bin/ghcup" + "$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + 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/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.10.1.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.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" + fi + + 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 '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: checkout + uses: actions/checkout@v3 + with: + path: source + submodules: "true" + - name: initial cabal.project for sdist + run: | + touch cabal.project + echo "packages: $GITHUB_WORKSPACE/source/lib" >> cabal.project + echo "packages: $GITHUB_WORKSPACE/source/hookup" >> cabal.project + echo "packages: $GITHUB_WORKSPACE/source/bot" >> cabal.project + echo "packages: $GITHUB_WORKSPACE/source/." >> cabal.project + echo "packages: $GITHUB_WORKSPACE/source/config-schema" >> cabal.project + echo "packages: $GITHUB_WORKSPACE/source/config-value" >> 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_irc_core="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/irc-core-[0-9.]*')" + echo "PKGDIR_irc_core=${PKGDIR_irc_core}" >> "$GITHUB_ENV" + PKGDIR_hookup="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/hookup-[0-9.]*')" + echo "PKGDIR_hookup=${PKGDIR_hookup}" >> "$GITHUB_ENV" + PKGDIR_irc_core_bot="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/irc-core-bot-[0-9.]*')" + echo "PKGDIR_irc_core_bot=${PKGDIR_irc_core_bot}" >> "$GITHUB_ENV" + PKGDIR_glirc="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/glirc-[0-9.]*')" + echo "PKGDIR_glirc=${PKGDIR_glirc}" >> "$GITHUB_ENV" + PKGDIR_config_schema="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/config-schema-[0-9.]*')" + echo "PKGDIR_config_schema=${PKGDIR_config_schema}" >> "$GITHUB_ENV" + PKGDIR_config_value="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/config-value-[0-9.]*')" + echo "PKGDIR_config_value=${PKGDIR_config_value}" >> "$GITHUB_ENV" + rm -f cabal.project cabal.project.local + touch cabal.project + touch cabal.project.local + echo "packages: ${PKGDIR_irc_core}" >> cabal.project + echo "packages: ${PKGDIR_hookup}" >> cabal.project + echo "packages: ${PKGDIR_irc_core_bot}" >> cabal.project + echo "packages: ${PKGDIR_glirc}" >> cabal.project + echo "packages: ${PKGDIR_config_schema}" >> cabal.project + echo "packages: ${PKGDIR_config_value}" >> cabal.project + echo "package irc-core" >> cabal.project + echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo "package hookup" >> cabal.project + echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo "package irc-core-bot" >> cabal.project + echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo "package glirc" >> cabal.project + echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo "package config-schema" >> cabal.project + echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo "package config-value" >> 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@v3 + 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_irc_core} || false + ${CABAL} -vnormal check + cd ${PKGDIR_hookup} || false + ${CABAL} -vnormal check + cd ${PKGDIR_irc_core_bot} || false + ${CABAL} -vnormal check + cd ${PKGDIR_glirc} || false + ${CABAL} -vnormal check + cd ${PKGDIR_config_schema} || false + ${CABAL} -vnormal check + cd ${PKGDIR_config_value} || 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 + uses: actions/cache/save@v3 + if: always() + with: + key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} + path: ~/.cabal/store diff --git a/bot/irc-core-bot.cabal b/bot/irc-core-bot.cabal index 3c208d5e..b0a1937d 100644 --- a/bot/irc-core-bot.cabal +++ b/bot/irc-core-bot.cabal @@ -2,7 +2,11 @@ cabal-version: 2.2 name: irc-core-bot version: 0.1.0.0 synopsis: Example bot using irc-core -description: Example bot using irc-core +description: + This package is intended to show what it might look like to use + irc-core for your own IRC automation or client development. + It is certainly not a useful bot on its own. + homepage: https://github.com/glguy/irc-core license: ISC license-file: LICENSE @@ -11,7 +15,8 @@ maintainer: emertens@gmail.com copyright: 2016,2020 Eric Mertens category: Network build-type: Simple -extra-source-files: ChangeLog.md +extra-doc-files: ChangeLog.md +tested-with: GHC==9.4.7 executable irc-core-bot main-is: Main.hs diff --git a/config-schema b/config-schema index f9a7f2f1..5fd16a0d 160000 --- a/config-schema +++ b/config-schema @@ -1 +1 @@ -Subproject commit f9a7f2f12136e8657407360fe5b2a2b966438dcd +Subproject commit 5fd16a0d6e74422ff3d92f2dc7a9f1a3a379177f diff --git a/glirc.cabal b/glirc.cabal index 80a43a99..9e43895f 100644 --- a/glirc.cabal +++ b/glirc.cabal @@ -14,13 +14,12 @@ author: Eric Mertens maintainer: emertens@gmail.com copyright: 2016-2019 Eric Mertens category: Network -extra-source-files: ChangeLog.md README.md - exec/linux_exported_symbols.txt +extra-source-files: exec/linux_exported_symbols.txt exec/macos_exported_symbols.txt -extra-doc-files: glirc.1 +extra-doc-files: glirc.1 ChangeLog.md README.md homepage: https://github.com/glguy/irc-core bug-reports: https://github.com/glguy/irc-core/issues -tested-with: GHC==8.6.5 +tested-with: GHC==9.4.7 custom-setup setup-depends: base >=4.12 && <4.19, @@ -164,7 +163,7 @@ library async >=2.2 && <2.3, attoparsec ^>=0.14, base64-bytestring >=1.0.0.1&& <1.3, - bytestring >=0.10.8 && <0.12, + bytestring >=0.10.8 && <0.13, config-schema ^>=1.3.0.0, config-value ^>=0.8, containers >=0.5.7 && <0.7, @@ -187,7 +186,7 @@ library split >=0.2 && <0.3, stm >=2.4 && <2.6, template-haskell >=2.11 && <2.21, - text >=1.2.2 && <2.1, + text >=1.2.2 && <2.2, time >=1.10 && <1.14, transformers >=0.5.2 && <0.7, unix >=2.7 && <2.9, diff --git a/hookup/hookup.cabal b/hookup/hookup.cabal index 80d85b14..b733a0d1 100644 --- a/hookup/hookup.cabal +++ b/hookup/hookup.cabal @@ -11,10 +11,10 @@ maintainer: emertens@gmail.com copyright: 2016-2020 Eric Mertens category: Network build-type: Simple -extra-source-files: ChangeLog.md +extra-doc-files: ChangeLog.md homepage: https://github.com/glguy/irc-core bug-reports: https://github.com/glguy/irc-core/issues -tested-with: GHC==8.10.1 +tested-with: GHC==9.4.7 source-repository head type: git diff --git a/lib/irc-core.cabal b/lib/irc-core.cabal index a22385ea..1b1520e9 100644 --- a/lib/irc-core.cabal +++ b/lib/irc-core.cabal @@ -12,9 +12,10 @@ maintainer: emertens@gmail.com copyright: 2016 Eric Mertens category: Network build-type: Simple -extra-source-files: ChangeLog.md +extra-doc-files: ChangeLog.md homepage: https://github.com/glguy/irc-core bug-reports: https://github.com/glguy/irc-core/issues +tested-with: GHC==9.4.7 source-repository head type: git @@ -39,7 +40,7 @@ library hashable >=1.2 && <1.5, primitive >=0.6 && <0.8, text >=1.2 && <2.1, - time >=1.6 && <1.12, + time >=1.6 && <1.13, vector >=0.11 && <0.14 hs-source-dirs: src diff --git a/src/Client/CApi/Types.hsc b/src/Client/CApi/Types.hsc index 44d43f8a..23ad22ff 100644 --- a/src/Client/CApi/Types.hsc +++ b/src/Client/CApi/Types.hsc @@ -1,4 +1,4 @@ -{-# Language RecordWildCards #-} +{-# Language RecordWildCards, ImportQualifiedPost #-} {-| Module : Client.CApi.Types