Skip to content

Commit

Permalink
Don't test sdist in the main script.
Browse files Browse the repository at this point in the history
  • Loading branch information
23Skidoo committed Jul 27, 2016
1 parent 76ebe2f commit 1a2c713
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions travis-script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ cp cabal.project.travis cabal.project.local
# Cabal
# ---------------------------------------------------------------------

# Needed to work around some bugs in nix-local-build code.
export CABAL_BUILDDIR="${CABAL_BDIR}"

# NB: Best to do everything for a single package together as it's
Expand Down Expand Up @@ -70,16 +71,13 @@ timed cabal new-build Cabal Cabal:package-tests Cabal:unit-tests
# Check for package warnings
(cd Cabal && timed cabal check) || exit $?

# Test that an sdist can be created
(cd Cabal && timed cabal sdist --builddir=${CABAL_BDIR}) || exit $?

unset CABAL_BUILDDIR

# ---------------------------------------------------------------------
# cabal-install
# ---------------------------------------------------------------------

# Setting the build directory here helps avoid sdist bugs.
# Needed to work around some bugs in nix-local-build code.
export CABAL_BUILDDIR="${CABAL_INSTALL_BDIR}"

timed cabal new-build cabal-install:cabal \
Expand All @@ -98,7 +96,6 @@ timed cabal new-build cabal-install:cabal \
(cd cabal-install && timed ${CABAL_INSTALL_SETUP} haddock --builddir=${CABAL_INSTALL_BDIR} ) || exit $?

(cd cabal-install && timed cabal check) || exit $?
(cd cabal-install && timed cabal sdist --builddir=${CABAL_INSTALL_BDIR}) || exit $?

unset CABAL_BUILDDIR

Expand Down

0 comments on commit 1a2c713

Please sign in to comment.