From c1088228f93e3b682945b4a0964ffa4a795d02e9 Mon Sep 17 00:00:00 2001 From: David Turner Date: Fri, 1 May 2015 08:31:20 +0100 Subject: [PATCH 1/6] Add @davecturner github username --- build-constraints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 58f86f05..f10dff45 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -692,7 +692,7 @@ packages: "Marcin Mrotek ": - type-list - "David Turner ": + "David Turner @davecturner": - alarmclock - bank-holidays-england From 7a3f8b0658a54e2fc8f63ca46adcd8ca93d2ad47 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 3 May 2015 07:56:32 +0300 Subject: [PATCH 2/6] stackage-build-plan --- README.md | 1 + build-constraints.yaml | 1 + stackage/stackage.cabal | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2cc5a0c4..5b15fd98 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ project information. In addition, we have the following repositories: * [stackage-update](https://github.com/fpco/stackage-update) [![Build Status](https://travis-ci.org/fpco/stackage-update.svg?branch=master)](https://travis-ci.org/fpco/stackage-update) * [stackage-upload](https://github.com/fpco/stackage-upload) [![Build Status](https://travis-ci.org/fpco/stackage-upload.svg?branch=master)](https://travis-ci.org/fpco/stackage-upload) * [stackage-install](https://github.com/fpco/stackage-install) [![Build Status](https://travis-ci.org/fpco/stackage-install.svg?branch=master)](https://travis-ci.org/fpco/stackage-install) +* [stackage-build-plan](https://github.com/fpco/stackage-build-plan) [![Build Status](https://travis-ci.org/fpco/stackage-build-plan.svg?branch=master)](https://travis-ci.org/fpco/stackage-build-plan) Get your package included ------------------------- diff --git a/build-constraints.yaml b/build-constraints.yaml index f10dff45..0b5500d2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -101,6 +101,7 @@ packages: - stackage-upload - stackage-cli - stackage-install + - stackage-build-plan - statistics-linreg - th-expand-syns - thyme diff --git a/stackage/stackage.cabal b/stackage/stackage.cabal index ca16cdd8..d9a004d1 100644 --- a/stackage/stackage.cabal +++ b/stackage/stackage.cabal @@ -1,5 +1,5 @@ name: stackage -version: 0.7.1.0 +version: 0.7.2.0 synopsis: Dummy package forcing installation of other Stackage packages homepage: https://www.stackage.org/ license: MIT @@ -18,6 +18,7 @@ library , stackage-update , stackage-upload , stackage-install + , stackage-build-plan default-language: Haskell2010 source-repository head From 53376ff60d0d7881419fec85044aec560c81acb0 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 3 May 2015 08:19:23 +0300 Subject: [PATCH 3/6] Skip tests for yesodweb/Shelly.hs#98 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0b5500d2..4636859b 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1084,6 +1084,9 @@ skipped-tests: # https://github.com/Soostone/retry/issues/18 - retry + # https://github.com/yesodweb/Shelly.hs/pull/98 + - shelly + # Tests which we should build and run, but which are expected to fail. We # should not fail a build based on a test failure for one of these packages. expected-test-failures: From 241dbca1f1373c392ff67709afee9aa4d76efdeb Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 3 May 2015 08:31:04 +0300 Subject: [PATCH 4/6] Allow setting constraints on create-plan --- automated/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automated/build.sh b/automated/build.sh index 3d92d45d..08a344a8 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -68,6 +68,6 @@ ARGS_BUILD="$ARGS_COMMON -v $CABAL_DIR:/home/stackage/.cabal:ro -v $GHC_DIR:/hom ARGS_UPLOAD="$ARGS_COMMON -v $AUTH_TOKEN:/auth-token:ro -v $HACKAGE_CREDS:/hackage-creds:ro -v $CURATOR_DIR:/home/stackage/.stackage-curator -v $SSH_DIR:/home/ubuntu/.ssh:ro -v $GITCONFIG:/home/stackage/.gitconfig:ro" # Use cabal update first to initialize ~/.cabal.config, then use stackage-curator update to get it securely -docker run $ARGS_PREBUILD snoyberg/stackage /bin/bash -c "cabal update && stackage-curator update && stackage-curator create-plan --plan-file $PLAN_FILE --target $TARGET && stackage-curator check --plan-file $PLAN_FILE && stackage-curator fetch --plan-file $PLAN_FILE && cabal install random cabal-install" +docker run $ARGS_PREBUILD snoyberg/stackage /bin/bash -c "cabal update && stackage-curator update && stackage-curator create-plan --plan-file $PLAN_FILE --target $TARGET ${CONSTRAINTS:-} && stackage-curator check --plan-file $PLAN_FILE && stackage-curator fetch --plan-file $PLAN_FILE && cabal install random cabal-install" docker run $ARGS_BUILD snoyberg/stackage stackage-curator make-bundle --plan-file $PLAN_FILE --bundle-file $BUNDLE_FILE --target $TARGET docker run $ARGS_UPLOAD snoyberg/stackage /bin/bash -c "stackage-curator upload --bundle-file $BUNDLE_FILE && stackage-curator hackage-distro --plan-file $PLAN_FILE --target $TARGET && stackage-curator upload-github --plan-file $PLAN_FILE --target $TARGET" From 26936be15c42e4db4691f72519d63b76fc10808c Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 3 May 2015 09:49:55 +0300 Subject: [PATCH 5/6] Don't skip tests yesodweb/Shelly.hs#98 --- build-constraints.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 4636859b..0b5500d2 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1084,9 +1084,6 @@ skipped-tests: # https://github.com/Soostone/retry/issues/18 - retry - # https://github.com/yesodweb/Shelly.hs/pull/98 - - shelly - # Tests which we should build and run, but which are expected to fail. We # should not fail a build based on a test failure for one of these packages. expected-test-failures: From 98799db672ceeeed70cbe39d8afd00c95ba7ce9d Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 3 May 2015 13:31:39 +0300 Subject: [PATCH 6/6] Expected test failure yesodweb/Shelly.hs#99 --- build-constraints.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index 0b5500d2..70cab47c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -1273,6 +1273,9 @@ expected-test-failures: - hedis - redis-io + # https://github.com/yesodweb/Shelly.hs/issues/99 + - shelly + # Haddocks which are expected to fail. Same concept as expected test failures. expected-haddock-failures: # https://github.com/acw/bytestring-progress/issues/4