Merge pull request #86 from jswebtools/travis

Add Travis build

Author: dmjio

.gitignore

@@ -4,3 +4,6 @@
 *.class
 .DS_Store
 /webbits
+dist*
+*~
+result

.travis.yml

@@ -1,160 +1,17 @@
-# New travis config by FPComplete/Michael Snoyman
+language: nix
 
-# Use new container infrastructure to enable caching
-sudo: false
-
-# Choose a lightweight base image; we provide our own build tools.
-language: c
-
-# Caching so the next build will be fast too.
-cache:
-  directories:
-  - $HOME/.ghc
-  - $HOME/.cabal
-  - $HOME/.stack
-
-# The different configurations we want to test. We have BUILD=cabal which uses
-# cabal-install, and BUILD=stack which uses Stack. More documentation on each
-# of those below.
-#
-# We set the compiler values here to tell Travis to use a different
-# cache file per set of arguments.
-#
-# If you need to have different apt packages for each combination in the
-# matrix, you can use a line such as:
-#     addons: {apt: {packages: [libfcgi-dev,libgmp-dev]}}
 matrix:
+  fast_finish: true
   include:
-  # We grab the appropriate GHC and cabal-install versions from hvr's PPA. See:
-  # https://github.com/hvr/multi-ghc-travis
-  # - env: BUILD=cabal GHCVER=7.0.4 CABALVER=1.16
-  #   compiler: ": #GHC 7.0.4"
-  #   addons: {apt: {packages: [cabal-install-1.16,ghc-7.0.4], sources: [hvr-ghc]}}
-  # - env: BUILD=cabal GHCVER=7.2.2 CABALVER=1.16
-  #   compiler: ": #GHC 7.2.2"
-  #   addons: {apt: {packages: [cabal-install-1.16,ghc-7.2.2], sources: [hvr-ghc]}}
-  - env: BUILD=cabal GHCVER=7.4.2 CABALVER=1.16
-    compiler: ": #GHC 7.4.2"
-    addons: {apt: {packages: [cabal-install-1.16,ghc-7.4.2], sources: [hvr-ghc]}}
-  - env: BUILD=cabal GHCVER=7.6.3 CABALVER=1.16
-    compiler: ": #GHC 7.6.3"
-    addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3], sources: [hvr-ghc]}}
-  - env: BUILD=cabal GHCVER=7.8.4 CABALVER=1.18
-    compiler: ": #GHC 7.8.4"
-    addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}
-  - env: BUILD=cabal GHCVER=7.10.3 CABALVER=1.22
-    compiler: ": #GHC 7.10.3"
-    addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}
-  - env: BUILD=cabal GHCVER=8.0.2 CABALVER=1.24
-    compiler: ": #GHC 8.0.2"
-    addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.2], sources: [hvr-ghc]}}
-
-  # Build with the newest GHC and cabal-install. This is an accepted failure,
-  # see below.
-  - env: BUILD=cabal GHCVER=head  CABALVER=head
-    compiler: ": #GHC HEAD"
-    addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}}
-
-  # The Stack builds. We can pass in arbitrary Stack arguments via the ARGS
-  # variable, such as using --stack-yaml to point to a different file.
-  # - env: BUILD=stack ARGS="--resolver lts-2"
-  #   compiler: ": #stack 7.8.4"
-  #   addons: {apt: {packages: [ghc-7.8.4], sources: [hvr-ghc]}}
-
-  # - env: BUILD=stack ARGS="--resolver lts-3"
-  #   compiler: ": #stack 7.10.2"
-  #   addons: {apt: {packages: [ghc-7.10.2], sources: [hvr-ghc]}}
-
-  - env: BUILD=stack ARGS="--resolver lts-5"
-    compiler: ": #stack 7.10.3"
-    addons: {apt: {packages: [ghc-7.10.3], sources: [hvr-ghc]}}
-
-  - env: BUILD=stack ARGS="--resolver lts-6"
-    compiler: ": #stack 7.10.3"
-    addons: {apt: {packages: [ghc-7.10.3], sources: [hvr-ghc]}}
-
-  - env: BUILD=stack ARGS="--resolver lts-7"
-    compiler: ": #stack 8.0.1"
-    addons: {apt: {packages: [ghc-8.0.1], sources: [hvr-ghc]}}
-
-  - env: BUILD=stack ARGS="--resolver lts-8"
-    compiler: ": #stack 8.0.2"
-    addons: {apt: {packages: [ghc-8.0.2], sources: [hvr-ghc]}}
-
-  # Nightly builds are allowed to fail
-  - env: BUILD=stack ARGS="--resolver nightly"
-    compiler: ": #stack nightly"
-    addons: {apt: {packages: [libgmp-dev]}}
-
-  # Build on OS X in addition to Linux
-  # - env: BUILD=stack ARGS="--resolver lts-2"
-  #   compiler: ": #stack 7.8.4 osx"
-  #   os: osx
-
-  # - env: BUILD=stack ARGS="--resolver lts-3"
-  #   compiler: ": #stack 7.10.2 osx"
-  #   os: osx
-
-  - env: BUILD=stack ARGS="--resolver lts-5"
-    compiler: ": #stack 7.10.3 osx"
-    os: osx
-
-  - env: BUILD=stack ARGS="--resolver nightly"
-    compiler: ": #stack nightly osx"
-    os: osx
-
+    - env: GHCVER=ghc844
+    - env: GHCVER=ghc865
+    - env: GHCVER=ghc881
+    - env: GHCVER=ghc882
+    - env: GHCVER=ghc8101
+    - env: GHCVER=ghcHEAD
   allow_failures:
-  - env: BUILD=cabal GHCVER=head  CABALVER=head
-  - env: BUILD=stack ARGS="--resolver nightly"
-
-before_install:
-# Using compiler above sets CC to an invalid value, so unset it
-- unset CC
-
-# We want to always allow newer versions of packages when building on GHC HEAD
-- CABALARGS=""
-- if [ "x$GHCVER" = "xhead" ]; then CABALARGS=--allow-newer; fi
-
-# Download and unpack the stack executable
-- export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$HOME/.local/bin:$PATH
-- mkdir -p ~/.local/bin
-- |
-  if [ `uname` = "Darwin" ]
-  then
-    curl --insecure -L https://www.stackage.org/stack/osx-x86_64 | tar xz --strip-components=1 --include '*/stack' -C ~/.local/bin
-  else
-    curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
-  fi
-
-install:
-- echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
-- if [ -f configure.ac ]; then autoreconf -i; fi
-- |
-  case "$BUILD" in
-    stack)
-      stack --no-terminal --install-ghc $ARGS build --only-dependencies --test
-      ;;
-    cabal)
-      cabal --version
-      travis_retry cabal update
-      cabal install --only-dependencies --enable-tests --enable-benchmarks --force-reinstalls --ghc-options=-O0 --reorder-goals --max-backjumps=-1 $CABALARGS
-      ;;
-  esac
+    - env: GHCVER=ghc8101
+    - env: GHCVER=ghcHEAD
 
 script:
-- |
-  case "$BUILD" in
-    stack)
-      stack --no-terminal $ARGS test --haddock --no-haddock-deps
-      ;;
-    cabal)
-      cabal configure --enable-tests --enable-benchmarks -v2 --ghc-options="-O0 -Werror"
-      cabal build
-      cabal check || [ "$CABALVER" == "1.16" ]
-      cabal test
-      cabal sdist
-      cabal copy
-      SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz && \
-        (cd dist && cabal install --force-reinstalls "$SRC_TGZ")
-      ;;
-  esac
+ - nix-build -A language-ecmascript --argstr compiler $GHCVER

default.nix

@@ -0,0 +1,16 @@
+with (builtins.fromJSON (builtins.readFile ./nixpkgs.json));
+{ pkgs ? import (builtins.fetchTarball {
+    url = "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz";
+    inherit sha256;
+  }) {}
+, compiler ? "ghc881"
+}:
+let
+  overrides = self: super: { Diff = self.Diff_0_4_0; };
+  ghc = pkgs.haskell.packages.${compiler}.override { inherit overrides; };
+  language-ecmascript = ghc.callCabal2nix "language-ecmascript" ./. {};
+in
+{
+  inherit language-ecmascript;
+  inherit pkgs;
+}

language-ecmascript.cabal

@@ -72,14 +72,14 @@ Test-Suite test
   Type: exitcode-stdio-1.0
   Main-Is: TestMain.hs
   Other-Modules:
-    Language.ECMAScript3.Lexer                                        
-    Language.ECMAScript3.Parser                                       
-    Language.ECMAScript3.Parser.State                                 
-    Language.ECMAScript3.Parser.Type                                  
-    Language.ECMAScript3.PrettyPrint                                  
-    Language.ECMAScript3.SourceDiff                                   
-    Language.ECMAScript3.Syntax                                       
-    Language.ECMAScript3.Syntax.Annotations  
+    Language.ECMAScript3.Lexer
+    Language.ECMAScript3.Parser
+    Language.ECMAScript3.Parser.State
+    Language.ECMAScript3.Parser.Type
+    Language.ECMAScript3.PrettyPrint
+    Language.ECMAScript3.SourceDiff
+    Language.ECMAScript3.Syntax
+    Language.ECMAScript3.Syntax.Annotations
     Language.ECMAScript3.Syntax.Arbitrary
     Test.Diff
     Test.Unit

nixpkgs.json

@@ -0,0 +1,3 @@
+{ "rev" : "8130f3c1c2bb0e533b5e150c39911d6e61dcecc2"
+, "sha256" : "154nrhmm3dk5kmga2w5f7a2l6j79dvizrg4wzbrcwlbvdvapdgkb"
+}

shell.nix

@@ -0,0 +1 @@
+(import ./default.nix {}).language-ecmascript.env

upload.nix

@@ -0,0 +1,8 @@
+with (import ./default.nix {});
+with pkgs.haskell.lib;
+let
+  tarball = sdistTarball language-ecmascript;
+in
+pkgs.writeScriptBin "upload" ''
+  ${pkgs.cabal-install}/bin/cabal upload ${tarball}/*.tar.gz --publish
+''