Allow upload on upgraded hackage

.travis.yml

@@ -1,22 +1,94 @@
-language: "haskell"
-sudo: required
-dist: trusty
-ghc:
-  - "8.0"
-  - "8.2"
-  - "8.4"
-  - "8.6"
+# This Travis job script has been generated by a script via
+#
+#   haskell-ci 'fay.cabal' '--output' '.travis.yml'
+#
+# 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.10.3
+#
+version: ~> 1.0
+language: c
+os: linux
+dist: xenial
+git:
+  # whether to recursively clone submodules
+  submodules: false
+cache:
+  directories:
+    - $HOME/.cabal/packages
+    - $HOME/.cabal/store
+    - $HOME/.hlint
+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
+jobs:
+  include:
+    - compiler: ghc-8.8.3
+      addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.3","cabal-install-3.2"]}}
+      os: linux
+    - compiler: ghc-8.6.5
+      addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.6.5","cabal-install-3.2"]}}
+      os: linux
+    - compiler: ghc-8.4.4
+      addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.4.4","cabal-install-3.2"]}}
+      os: linux
+before_install:
+  - HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
+  - WITHCOMPILER="-w $HC"
+  - HADDOCK=$(echo "/opt/$CC/bin/haddock" | sed 's/-/\//')
+  - HCPKG="$HC-pkg"
+  - unset CC
+  - CABAL=/opt/ghc/bin/cabal
+  - CABALHOME=$HOME/.cabal
+  - export PATH="$CABALHOME/bin:$PATH"
+  - TOP=$(pwd)
+  - "HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\\d+)\\.(\\d+)\\.(\\d+)(\\.(\\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')"
+  - echo $HCNUMVER
+  - CABAL="$CABAL -vnormal+nowrap"
+  - set -o pipefail
+  - TEST=--enable-tests
+  - BENCH=--enable-benchmarks
+  - HEADHACKAGE=false
+  - rm -f $CABALHOME/config
+  - |
+    echo "verbose: normal +nowrap +markoutput"          >> $CABALHOME/config
+    echo "remote-build-reporting: anonymous"            >> $CABALHOME/config
+    echo "write-ghc-environment-files: always"          >> $CABALHOME/config
+    echo "remote-repo-cache: $CABALHOME/packages"       >> $CABALHOME/config
+    echo "logs-dir:          $CABALHOME/logs"           >> $CABALHOME/config
+    echo "world-file:        $CABALHOME/world"          >> $CABALHOME/config
+    echo "extra-prog-path:   $CABALHOME/bin"            >> $CABALHOME/config
+    echo "symlink-bindir:    $CABALHOME/bin"            >> $CABALHOME/config
+    echo "installdir:        $CABALHOME/bin"            >> $CABALHOME/config
+    echo "build-summary:     $CABALHOME/logs/build.log" >> $CABALHOME/config
+    echo "store-dir:         $CABALHOME/store"          >> $CABALHOME/config
+    echo "install-dirs user"                            >> $CABALHOME/config
+    echo "  prefix: $CABALHOME"                         >> $CABALHOME/config
+    echo "repository hackage.haskell.org"               >> $CABALHOME/config
+    echo "  url: http://hackage.haskell.org/"           >> $CABALHOME/config
 install:
-  - "travis_retry cabal install 'cpphs >= 1.18.3' 'happy >= 1.19.5'"
-  - "cabal install --dry-run -v3"
-  - "travis_retry cabal install --force-reinstalls --only-dependencies -ftest"
+  - ${CABAL} --version
+  - echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
+  - |
+    echo "program-default-options"                >> $CABALHOME/config
+    echo "  ghc-options: $GHCJOBS +RTS -M6G -RTS" >> $CABALHOME/config
+  - cat $CABALHOME/config
+  - travis_retry ${CABAL} v1-update -v
+  - "travis_retry ${CABAL} v1-install $WITHCOMPILER 'cpphs >= 1.18.3' 'happy >= 1.19.5'"
+  - "${CABAL} v1-install $WITHCOMPILER --dry-run -v3"
+  - "travis_retry ${CABAL} v1-install $WITHCOMPILER --force-reinstalls --only-dependencies -ftest"
 script:
-  - cabal install . fay-base/ --jobs=1 -ftest
-  - cabal exec fay-tests -- --num-threads=4 -random 20
-  - npm install
-  - npm test
-notifications:
-  email:
-    recipients: adam@bergmark.nl
-    on_success: change
-    on_failure: change
+  - "${CABAL} v1-install $WITHCOMPILER . fay-base/ --jobs=1 -ftest"
+  - "fay-tests --num-threads=4 -random 20"
+# REGENDATA ("0.10.3",["fay.cabal","--output",".travis.yml"])
+# EOF

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 See full history at: <https://github.com/faylang/fay/commits>
 
+### 0.24.1.1 (2021-01-08)
+
+* Relax boundaries for aeson, tasty, base-compat. Allow builds for Gentoo (#469).
+
 ### 0.24.1.0 (2020-03-26)
 
 * GHC 8.10.1 support.

fay-base/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Changelog
 
+## 0.21.1.2 (2020-02-09)
+
+* Cabal-version upgraded to 3.0.
+
 ## 0.21.1.1 (2019-05-01)
 
 * Added `Show` instance for `Text` (#453).

fay-base/fay-base.cabal

@@ -1,5 +1,6 @@
+cabal-version:       2.0
 name:                fay-base
-version:             0.21.1.1
+version:             0.21.1.2
 synopsis:            The base package for Fay.
 description:         The base package for Fay.
                      This package amongst others exports Prelude and FFI which you probably want to use with Fay.
@@ -12,7 +13,6 @@ bug-reports:         https://github.com/faylang/fay/issues
 copyright:           2012 Chris Done
 category:            Development, Fay
 build-type:          Simple
-cabal-version:       >=1.8
 extra-source-files:
   LICENSE
   README.md

fay.cabal

@@ -1,5 +1,6 @@
+cabal-version:       2.0
 name:                fay
-version:             0.24.1.0
+version:             0.24.1.1
 synopsis:            A compiler for Fay, a Haskell subset that compiles to JavaScript.
 description:         Fay is a proper subset of Haskell which is type-checked
                      with GHC, and compiled to JavaScript. It is lazy, pure, has a Fay monad,
@@ -22,7 +23,7 @@ maintainer:          adam@bergmark.nl
 copyright:           2012 Chris Done, Adam Bergmark
 category:            Development, Web, Fay
 build-type:          Custom
-cabal-version:       >=1.8
+Tested-with:         GHC ==8.4.4 || ==8.6.5 || ==8.8.3
 data-files:
   src/Fay/FFI.hs
 extra-source-files:
@@ -77,10 +78,13 @@ custom-setup
     , Cabal
 
 library
+  default-language:  Haskell2010                           
   ghc-options:       -O2 -Wall
   hs-source-dirs:
     src
     src/haskell-names
+  autogen-modules:
+    Paths_fay
   exposed-modules:
     Fay
     Fay.Compiler
@@ -174,6 +178,7 @@ library
     build-depends: tagged
 
 executable fay
+  default-language:  Haskell2010                           
   hs-source-dirs:    src/main
   ghc-options:       -O2 -Wall
   main-is:           Main.hs
@@ -187,6 +192,7 @@ executable fay
     Paths_fay
 
 executable fay-tests
+  default-language:  Haskell2010                           
   ghc-options:       -O2 -Wall -threaded -with-rtsopts=-N
   hs-source-dirs:    src/tests
   main-is:           Tests.hs

src/tests/Test/Compile.hs

@@ -101,11 +101,12 @@ assertPretty cfg flagName = do
   case res of
     Left l  -> assertFailure $ "Should compile, but failed with: " ++ show l
     Right js -> do
-    writeFile ("tests/Compile/" ++ flagName ++ suffix) js
-    (err, out) <- either id id <$> runScriptFile isTs ("tests/Compile/" ++ flagName ++ suffix)
-    when (err /= "") $ assertFailure err
-    expected <- readFile $ "tests/Compile/" ++ flagName ++ ".res"
-    assertEqual (flagName ++ " node stdout") expected out
+      writeFile ("tests/Compile/" ++ flagName ++ suffix) js
+      (err, out) <- either id id <$> runScriptFile isTs
+        ("tests/Compile/" ++ flagName ++ suffix)
+      when (err /= "") $ assertFailure err
+      expected <- readFile $ "tests/Compile/" ++ flagName ++ ".res"
+      assertEqual (flagName ++ " node stdout") expected out
 
 case_pretty :: Assertion
 case_pretty = do