ini.cabal: new maintainer, TypeOperators, tested-with GHC 9.4.1

2024-08-16 02:20:36 +03:00 · 2022-07-25 23:44:37 +02:00 · 2022-07-25 23:44:37 +02:00 · 5939aa6123
commit 5939aa6123
parent 0891702a93
4 changed files with 50 additions and 19 deletions
--- a/.github/workflows/haskell-ci.yml
+++ b/.github/workflows/haskell-ci.yml
@ -8,18 +8,22 @@
 #
 # For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.14.3.20220416
+# version: 0.15.20220710
 #
-# REGENDATA ("0.14.3.20220416",["github","ini.cabal"])
+# REGENDATA ("0.15.20220710",["github","ini.cabal"])
 #
 name: Haskell-CI
 on:
-  - push
-  - pull_request
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
 jobs:
  linux:
    name: Haskell-CI - Linux - ${{ matrix.compiler }}
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
    timeout-minutes:
      60
    container:
@ -28,9 +32,14 @@ jobs:
    strategy:
      matrix:
        include:
-          - compiler: ghc-9.2.2
+          - compiler: ghc-9.4.0.20220623
            compilerKind: ghc
-            compilerVersion: 9.2.2
+            compilerVersion: 9.4.0.20220623
+            setup-method: ghcup
+            allow-failure: true
+          - compiler: ghc-9.2.3
+            compilerKind: ghc
+            compilerVersion: 9.2.3
            setup-method: ghcup
            allow-failure: false
          - compiler: ghc-9.0.2
@ -106,18 +115,19 @@ jobs:
          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.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
+            curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$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
+            "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml;
+            "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
+            "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.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.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
+            curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"
            chmod a+x "$HOME/.ghcup/bin/ghcup"
-            "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
+            "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
          fi
        env:
          HCKIND: ${{ matrix.compilerKind }}
@ -148,7 +158,7 @@ jobs:
          echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
          echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
          echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
-          echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
+          if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
          echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
          echo "GHCJSARITH=0" >> "$GITHUB_ENV"
        env:
@ -177,6 +187,18 @@ jobs:
          repository hackage.haskell.org
            url: http://hackage.haskell.org/
          EOF
+          if $HEADHACKAGE; then
+          cat >> $CABAL_CONFIG <<EOF
+          repository head.hackage.ghc.haskell.org
+             url: https://ghc.gitlab.haskell.org/head.hackage/
+             secure: True
+             root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
+                        26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
+                        f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
+             key-threshold: 3
+          active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
+          EOF
+          fi
          cat >> $CABAL_CONFIG <<EOF
          program-default-options
            ghc-options: $GHCJOBS +RTS -M3G -RTS
@ -228,6 +250,9 @@ jobs:
          if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "    ghc-options: -Werror=missing-methods" >> cabal.project ; fi
          cat >> cabal.project <<EOF
          EOF
+          if $HEADHACKAGE; then
+          echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
+          fi
          $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(ini)$/; }' >> cabal.project.local
          cat cabal.project
          cat cabal.project.local
@ -260,7 +285,7 @@ jobs:
          ${CABAL} -vnormal check
      - name: haddock
        run: |
-          $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
+          $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
      - name: unconstrained build
        run: |
          rm -f cabal.project.local
--- a/.gitignore
+++ b/.gitignore
@ -10,3 +10,4 @@ tags
 .cabal-sandbox/
 cabal.sandbox.config
 .stack-work/
+/dist-newstyle/
--- a/cabal.haskell-ci
+++ b/cabal.haskell-ci
@ -0,0 +1 @@
+branches: master
--- a/ini.cabal
+++ b/ini.cabal
@ -6,15 +6,16 @@ description:         Quick and easy configuration files in the INI format.
 license:             BSD3
 license-file:        LICENSE
 author:              Chris Done
-maintainer:          chrisdone@gmail.com
-homepage:            http://github.com/chrisdone/ini
-bug-reports:         http://github.com/chrisdone/ini/issues
+maintainer:          Andreas Abel
+homepage:            https://github.com/andreasabel/ini
+bug-reports:         https://github.com/andreasabel/ini/issues
 copyright:           2013 Chris Done
 category:            Data, Configuration
 build-type:          Simple

 tested-with:
-  GHC == 9.2.2
+  GHC == 9.4.1
+  GHC == 9.2.3
  GHC == 9.0.2
  GHC == 8.10.7
  GHC == 8.8.4
@ -41,8 +42,11 @@ library

  default-language:   Haskell98
  default-extensions: OverloadedStrings
+                      TypeOperators

  ghc-options:        -Wall
+  if impl(ghc >= 8)
+    ghc-options:      -Wcompat

 test-suite ini-test
  type: exitcode-stdio-1.0
@ -57,4 +61,4 @@ test-suite ini-test

 source-repository head
  type:     git
-  location: http://github.com/chrisdone/ini.git
+  location: https://github.com/andreasabel/ini.git