From 5ee509634d1babeccf0210951962538c3f22a8db Mon Sep 17 00:00:00 2001 From: Vladislav Zavialov Date: Sun, 27 Oct 2024 02:32:30 +0300 Subject: [PATCH] Update to 0.3.0.2 --- .github/workflows/ci.yml | 39 ------ .github/workflows/haskell-ci.yml | 201 +++++++++++++++++++++++++++++++ ChangeLog.md | 4 +- README.md | 1 - named.cabal | 16 +-- src/Named/Internal.hs | 24 +--- stack.yaml | 3 - 7 files changed, 216 insertions(+), 72 deletions(-) delete mode 100644 .github/workflows/ci.yml create mode 100644 .github/workflows/haskell-ci.yml delete mode 100644 stack.yaml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index 7c490a9..0000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: CI - -on: - pull_request: - push: - branches: [ master ] - -jobs: - cabal-build: - strategy: - matrix: - ghc-version: - - "8.4.4" - - "8.6.5" - - "8.8.4" - - "8.10.7" - - "9.0.1" - - "9.2.5" - - "9.4.4" - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: haskell/actions/setup@v1 - with: - cabal-version: "3.4" - ghc-version: ${{ matrix.ghc-version }} - - name: Cache - uses: actions/cache@v1 - with: - path: ~/.cabal - key: ${{ runner.os }}-${{ matrix.ghc-version }} - - name: Install dependencies - run: | - cabal update - cabal build --only-dependencies --enable-tests --enable-benchmarks - - name: Build - run: cabal build --enable-tests --enable-benchmarks all - - name: Run tests - run: cabal test all diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml new file mode 100644 index 0000000..8c7f2cd --- /dev/null +++ b/.github/workflows/haskell-ci.yml @@ -0,0 +1,201 @@ +# This GitHub workflow config has been generated by a script via +# +# haskell-ci 'github' 'named.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.19.20240708 +# +# REGENDATA ("0.19.20240708",["github","named.cabal"]) +# +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.10.1 + compilerKind: ghc + compilerVersion: 9.10.1 + setup-method: ghcup + allow-failure: false + - compiler: ghc-9.6.6 + compilerKind: ghc + compilerVersion: 9.6.6 + setup-method: ghcup + allow-failure: false + - compiler: ghc-9.4.8 + compilerKind: ghc + compilerVersion: 9.4.8 + 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 + mkdir -p "$HOME/.ghcup/bin" + curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$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.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + 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 + 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.12.1.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" + 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@v4 + 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_named="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/named-[0-9.]*')" + echo "PKGDIR_named=${PKGDIR_named}" >> "$GITHUB_ENV" + rm -f cabal.project cabal.project.local + touch cabal.project + touch cabal.project.local + echo "packages: ${PKGDIR_named}" >> cabal.project + echo "package named" >> 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@v4 + 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_named} || 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@v4 + if: always() + with: + key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }} + path: ~/.cabal/store diff --git a/ChangeLog.md b/ChangeLog.md index 6d74947..4024882 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,4 +1,6 @@ -* Bumped upper bounds for GHC 9.4 and older. +## 0.3.0.2 + +* Support GHCs 9.4 to 9.10, fix warnings. ## 0.3.0.1 diff --git a/README.md b/README.md index 30ec6d5..303573a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # `named` – keyword arguments for Haskell -[![Build Status](https://github.com/monadfix/named/workflows/CI/badge.svg)](https://github.com/monadfix/named/actions) [![Hackage](https://img.shields.io/hackage/v/named.svg)](https://hackage.haskell.org/package/named) `named` is a lightweight library for named function parameters (keyword diff --git a/named.cabal b/named.cabal index 5afef1c..e235d8c 100644 --- a/named.cabal +++ b/named.cabal @@ -1,5 +1,6 @@ +cabal-version: 2.4 name: named -version: 0.3.0.1 +version: 0.3.0.2 synopsis: Named parameters (keyword arguments) for Haskell description: `named` is a lightweight library for named function parameters (keyword @@ -28,7 +29,7 @@ description: > ! #to "/target/path" -license: BSD3 +license: BSD-3-Clause license-file: LICENSE author: Vladislav Zavialov maintainer: Monadfix @@ -37,8 +38,7 @@ bug-reports: https://github.com/monadfix/named/issues category: Control build-type: Simple extra-source-files: ChangeLog.md -tested-with: GHC ==8.0.2, GHC ==8.2.2, GHC ==8.4.4, GHC ==8.6.5, GHC ==8.8.5, GHC ==9.2.5, GHC ==9.4.4 -cabal-version: >=1.10 +tested-with: GHC ==9.4.8, GHC ==9.6.6, GHC ==9.10.1 source-repository head type: git @@ -46,9 +46,9 @@ source-repository head library exposed-modules: Named, Named.Internal - build-depends: base >=4.9 && <4.18 + build-depends: base >=4.16 && <4.21 hs-source-dirs: src - default-language: Haskell2010 + default-language: GHC2021 ghc-options: -Wall -fno-warn-unticked-promoted-constructors @@ -56,9 +56,9 @@ test-suite regression type: exitcode-stdio-1.0 main-is: Test.hs other-modules: TestImport - build-depends: base >=4.9 && <4.18, + build-depends: base >=4.16 && <4.21, named hs-source-dirs: test - default-language: Haskell2010 + default-language: GHC2021 ghc-options: -Wall -fno-warn-missing-signatures diff --git a/src/Named/Internal.hs b/src/Named/Internal.hs index 2667a8e..43e3f5b 100644 --- a/src/Named/Internal.hs +++ b/src/Named/Internal.hs @@ -1,8 +1,6 @@ -{-# LANGUAGE KindSignatures, DataKinds, FlexibleInstances, FlexibleContexts, - FunctionalDependencies, TypeFamilies, TypeOperators, - PatternSynonyms, UndecidableInstances, ConstraintKinds, - TypeApplications, ScopedTypeVariables, CPP, - AllowAmbiguousTypes #-} +{-# LANGUAGE AllowAmbiguousTypes, DataKinds, ExplicitNamespaces, + FunctionalDependencies, PatternSynonyms, TypeFamilies, + UndecidableInstances #-} module Named.Internal where @@ -12,6 +10,7 @@ import Data.Functor.Identity (Identity(..)) import Data.Kind (Type) import GHC.TypeLits (Symbol, TypeError, ErrorMessage(..)) import GHC.OverloadedLabels (IsLabel(..)) +import Data.Type.Equality (type (~)) {- | @@ -29,10 +28,7 @@ newtype NamedF f (a :: Type) (name :: Symbol) = -- | Match on an argument without specifying its name. See also: 'arg'. pattern Arg :: a -> name :! a pattern Arg a = ArgF (Identity a) - -#if MIN_VERSION_base(4,10,0) {-# COMPLETE Arg #-} -#endif -- | Infix notation for the type of a named parameter. type name :! a = NamedF Identity a name @@ -50,21 +46,13 @@ instance InjValue Maybe where injValue = Just instance (name ~ name', a ~ a', InjValue f) => IsLabel name (a -> NamedF f a' name') where -#if MIN_VERSION_base(4,10,0) fromLabel a = ArgF (injValue a) -#else - fromLabel _ a = ArgF (injValue a) -#endif {-# INLINE fromLabel #-} newtype Param p = Param p instance (p ~ NamedF f a name, InjValue f) => IsLabel name (a -> Param p) where -#if MIN_VERSION_base(4,10,0) fromLabel a = Param (fromLabel @name a) -#else - fromLabel pName a = Param (fromLabel pName a) -#endif {-# INLINE fromLabel #-} {- | Explicitly build a function parameter: @@ -181,11 +169,7 @@ A proxy for a name, intended for use with @-XOverloadedLabels@: data Name (name :: Symbol) = Name instance name ~ name' => IsLabel name' (Name name) where -#if MIN_VERSION_base(4,10,0) fromLabel = Name -#else - fromLabel _ = Name -#endif {-# INLINE fromLabel #-} {- | diff --git a/stack.yaml b/stack.yaml deleted file mode 100644 index 346432f..0000000 --- a/stack.yaml +++ /dev/null @@ -1,3 +0,0 @@ -resolver: lts-10.4 -packages: -- .