From c24c213219ccf2876fa9897c1103f04c40de37f5 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 2 Jan 2017 21:06:57 +0900 Subject: [PATCH 1/7] CURATORS.md: adding new curators --- CURATORS.md | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/CURATORS.md b/CURATORS.md index 0af3d9f3..d30420aa 100644 --- a/CURATORS.md +++ b/CURATORS.md @@ -279,15 +279,15 @@ Replace nightly with `lts7` to wipe the LTS 7 cache. ## Local curator setup -We don't run the full stackage build locally as that might take too +We do not run the full stackage build locally as that might take too much time. Some steps on the other hand are much faster to do yourself. -It's useful to be able to modify constraints locally before pushing to +It is useful to be able to modify constraints locally before pushing to the repository. To do this first install stackage-curator: `git clone git@github.com:fpco/stackage-curator.git && cd stackage-curator && stack install` or get the linux binary: https://s3.amazonaws.com/stackage-travis/stackage-curator/stackage-curator.bz2 -(it's a good idea to upgrade stackage-curator at least at the start of your week as curator). +(it is a good idea to upgrade stackage-curator at least at the start of your week as curator). Then clone the stackage repo `git clone git@github.com:fpco/stackage.git`. Inside it run `stack update && stackage-curator check` to get new packages and do dependency resolution. @@ -295,5 +295,10 @@ This can be used to make sure all version bounds are in place (including for test suites and benchmarks), to check whether bounds can be lifted, and to get `tell-me-when-its-released` notifications. -Notably this doesn't build anything, so you won't see any compilation +Notably this does not build anything, so you wont see any compilation errors for builds/tests/benchmarks. + +## Adding new curators + +1. Add public ssh key to build server +2. Add to fpco/stackage project. From b971aeca7a127e4a688a83d63462bfa6deed96e3 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 2 Jan 2017 21:16:56 +0900 Subject: [PATCH 2/7] CURATORS.md: mention authorized_keys --- CURATORS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CURATORS.md b/CURATORS.md index d30420aa..58f1691d 100644 --- a/CURATORS.md +++ b/CURATORS.md @@ -300,5 +300,5 @@ errors for builds/tests/benchmarks. ## Adding new curators -1. Add public ssh key to build server +1. Add public ssh key to `~/.ssh/authorized_keys` on build server 2. Add to fpco/stackage project. From 6f082b7683774cc7b251fefc2f71bc49bcff28f0 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 2 Jan 2017 14:38:48 +0200 Subject: [PATCH 3/7] Use build.stackage.org --- CURATORS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CURATORS.md b/CURATORS.md index 58f1691d..91306c21 100644 --- a/CURATORS.md +++ b/CURATORS.md @@ -207,7 +207,7 @@ You'll need to get your SSH public key added to the machine. ~/.ssh/config info: ``` Host stackage-build User curators - Hostname ec2-52-5-20-252.compute-1.amazonaws.com + Hostname build.stackage.org ``` ### Running the build script From ad6fd5495991fbd60fa59ba464b2f7af6d8786b7 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Mon, 2 Jan 2017 11:46:48 +0000 Subject: [PATCH 4/7] Add `generic` language, which Travis now supports. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 47bbda04..6df6863c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ sudo: false # Choose a lightweight base image; we provide our own build tools. -language: c +language: generic # GHC depends on GMP. You can add other dependencies here as well. addons: From a4463550ac194b36d5c48eba016adca29f8b124c Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Mon, 2 Jan 2017 13:31:08 +0000 Subject: [PATCH 5/7] Remove `safecopy` from expected test failures. https://github.com/acid-state/safecopy/issues/45#issuecomment-258045406 --- build-constraints.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/build-constraints.yaml b/build-constraints.yaml index 5d9be461..b999c83c 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -3040,7 +3040,6 @@ expected-test-failures: - dbus # 0.10.12 No issue tracker, e-mail sent to maintainer - hspec-expectations-pretty-diff # GHC 8 issue not reported upstream since issue tracker disabled - jose-jwt # doctest ambiguity https://github.com/fpco/stackage/issues/2169 - - safecopy # time 1.6 https://github.com/acid-state/safecopy/issues/45 - servant-server # 0.9.1.1 due to hspec-wai-0.8.0 https://github.com/haskell-servant/servant/issues/643 - sourcemap # https://github.com/chrisdone/sourcemap/issues/3 - text-ldap # # https://github.com/khibino/haskell-text-ldap/issues/1 From 81d3cbc81abfecc30ff616796deaaa43c29a0258 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 2 Jan 2017 23:01:23 +0900 Subject: [PATCH 6/7] build.sh: fix local stackage-curator --- automated/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automated/build.sh b/automated/build.sh index 1dd7dadd..75ac1ea5 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -77,7 +77,7 @@ rm -f stackage-curator stackage-curator.bz2 wget https://s3.amazonaws.com/stackage-travis/stackage-curator/stackage-curator.bz2 bunzip2 stackage-curator.bz2 chmod +x stackage-curator -stackage-curator --version +./stackage-curator --version ) ARGS_COMMON="--rm -v $WORKDIR:$HOME/work -w $HOME/work -v $BINDIR/stackage-curator:/usr/bin/stackage-curator:ro -v /etc/passwd:/etc/passwd:ro -v /etc/group:/etc/group:ro -v $EXTRA_BIN_DIR/stack:/usr/bin/stack:ro" From d56fd1903dfca57bc86800a723134b0c7649daa8 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Mon, 2 Jan 2017 15:37:57 +0000 Subject: [PATCH 7/7] Upper bounds for #2177 and #2178. --- build-constraints.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/build-constraints.yaml b/build-constraints.yaml index b999c83c..0cfdb097 100644 --- a/build-constraints.yaml +++ b/build-constraints.yaml @@ -2709,6 +2709,16 @@ packages: # https://github.com/fpco/stackage/issues/2136 - X11 < 1.7 + # https://github.com/fpco/stackage/issues/2177 + - aeson < 1.1.0.0 + + # https://github.com/fpco/stackage/issues/2178 + - hledger < 1.1 + - hledger-lib < 1.1 + - hledger-api < 1.1 + - hledger-ui < 1.1 + - hledger-web < 1.1 + # end of packages # Package flags are applied to individual packages, and override the values of