From 1a2c71362d03ca292d0a7225e5acb9d5f2581045 Mon Sep 17 00:00:00 2001 From: Mikhail Glushenkov Date: Wed, 27 Jul 2016 20:54:47 +0200 Subject: [PATCH] Don't test sdist in the main script. See https://github.com/haskell/cabal/pull/3630#issuecomment-235438329. --- travis-script.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/travis-script.sh b/travis-script.sh index 75af18d9321..7f1792853b4 100755 --- a/travis-script.sh +++ b/travis-script.sh @@ -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 @@ -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 \ @@ -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