Skip to content

Skip the Haddock step on macOS. #4934

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 6, 2017
Merged

Skip the Haddock step on macOS. #4934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97f2208
Comment.
23Skidoo Dec 4, 2017
90946d8
Skip the Haddock step on macOS.
23Skidoo Dec 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions Cabal/Distribution/Verbosity.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,17 @@ lessVerbose v =
Normal -> v { vLevel = Silent }
Silent -> v

-- | Combinator for transforming verbosity level while retaining the original hidden state.
-- | Combinator for transforming verbosity level while retaining the
-- original hidden state.
--
-- For instance, the following property holds
--
-- prop> isVerboseNoWrap (modifyVerbosity (max verbose) v) == isVerboseNoWrap v
--
-- __Note__: you can use @modifyVerbosity (const v1) v0@ to overwrite @v1@'s flags with @v0@'s flags.
-- __Note__: you can use @modifyVerbosity (const v1) v0@ to overwrite
-- @v1@'s flags with @v0@'s flags.
--
-- @since 2.0.1
-- @since 2.0.1.0
modifyVerbosity :: (Verbosity -> Verbosity) -> Verbosity -> Verbosity
modifyVerbosity f v = v { vLevel = vLevel (f v) }

Expand Down
10 changes: 7 additions & 3 deletions travis-script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,10 @@ if [ "x$CABAL_INSTALL_ONLY" != "xYES" ] ; then
# Cabal otherwise).
timed cabal new-build $jobs Cabal Cabal:unit-tests Cabal:check-tests Cabal:parser-tests Cabal:parser-hackage-tests --enable-tests

# Run haddock
(cd Cabal && timed cabal act-as-setup --build-type=Simple -- haddock --builddir=${CABAL_BDIR}) || exit $?
# Run haddock.
if [ "$TRAVIS_OS_NAME" = "linux" ]; then
(cd Cabal && timed cabal act-as-setup --build-type=Simple -- haddock --builddir=${CABAL_BDIR}) || exit $?
fi

# Check for package warnings
(cd Cabal && timed cabal check) || exit $?
Expand Down Expand Up @@ -163,7 +165,9 @@ fi

# Haddock
# TODO: Figure out why this needs to be run before big tests
(cd cabal-install && timed ${CABAL_INSTALL_SETUP} haddock --builddir=${CABAL_INSTALL_BDIR} ) || exit $?
if [ "$TRAVIS_OS_NAME" = "linux" ]; then
(cd cabal-install && timed ${CABAL_INSTALL_SETUP} haddock --builddir=${CABAL_INSTALL_BDIR} ) || exit $?
fi

# Tests need this
timed ${CABAL_INSTALL_BDIR}/build/cabal/cabal update
Expand Down