diff --git a/.gitignore b/.gitignore index af1adf728a989da480d0f866968dcbff3177ce0c..82f3a88e17b409ae206b19e55f5c5b23eb83bcc1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,22 @@ -dist-install dist +dist-* +cabal-dev +*.o +*.hi +*.chi +*.chs.h +*.dyn_o +*.dyn_hi +.hpc +.hsenv +.cabal-sandbox/ +cabal.sandbox.config +*.prof +*.aux +*.hp +*.eventlog +.stack-work/ +cabal.project.local +cabal.project.local~ +.HTF/ +.ghc.environment.* diff --git a/.travis.yml b/.travis.yml index c3b66ebb2b890766034c28169b2a74499a320698..ac0b535cbf12e38f46b65b29c61a5cf9b2afabb4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ # This Travis job script has been generated by a script via # -# runghc make_travis_yml_2.hs 'hsc2hs.cabal' +# runghc make_travis_yml_2.hs '-o' '.travis.yml' 'cabal.project' # # For more information, see https://github.com/hvr/multi-ghc-travis # @@ -54,12 +54,15 @@ matrix: - compiler: "ghc-8.2.2" # env: TEST=--disable-tests BENCH=--disable-benchmarks addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}} - - compiler: "ghc-8.4.1" + - compiler: "ghc-8.4.2" + # env: TEST=--disable-tests BENCH=--disable-benchmarks + addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.2], sources: [hvr-ghc]}} + - compiler: "ghc-head" env: GHCHEAD=true - addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.4.1], sources: [hvr-ghc]}} + addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-head], sources: [hvr-ghc]}} allow_failures: - - compiler: "ghc-8.4.1" + - compiler: "ghc-head" before_install: - HC=${CC} @@ -132,5 +135,5 @@ script: # cabal check - (cd hsc2hs-* && cabal check) -# REGENDATA ["hsc2hs.cabal"] +# REGENDATA ["-o",".travis.yml","cabal.project"] # EOF diff --git a/cabal.project b/cabal.project new file mode 100644 index 0000000000000000000000000000000000000000..e6fdbadb4398bc0e333947b5fb8021778310d943 --- /dev/null +++ b/cabal.project @@ -0,0 +1 @@ +packages: . diff --git a/hsc2hs.cabal b/hsc2hs.cabal index 02c4aee67c5ecfdd5ebd48814a31f5ffec21749d..c97f2449899aeaa5840a4dfedaebb937886da802 100644 --- a/hsc2hs.cabal +++ b/hsc2hs.cabal @@ -23,7 +23,7 @@ Category: Development Data-Files: template-hsc.h build-type: Simple cabal-version: >=1.10 -tested-with: GHC==8.2.1, GHC==8.0.2, GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2, GHC==7.2.2, GHC==7.0.4 +tested-with: GHC==8.4.2, GHC==8.2.2, GHC==8.0.2, GHC==7.10.3, GHC==7.8.4, GHC==7.6.3, GHC==7.4.2, GHC==7.2.2, GHC==7.0.4 extra-source-files: changelog.md