on master help sign in
Update from parent
commit31b60043ff74b7426644d37d846277c06076455e authororome <royl@aldaron.com> dateMon 2 Jan 2017, 12:54 (10 years ago) parent4d8d68ed56fd19
4 files changed+22−8
.travis.yml+1−1 CURATORS.md+10−5 automated/build.sh+1−1 build-constraints.yaml+10−1
.travis.yml+1−1
@@ -2,7 +2,7 @@
22sudo: false
33
44# Choose a lightweight base image; we provide our own build tools.
5−language: c
5+language: generic
66
77# GHC depends on GMP. You can add other dependencies here as well.
88addons:
CURATORS.md+10−5
@@ -207,7 +207,7 @@ You'll need to get your SSH public key added to the machine. ~/.ssh/config info:
207207```
208208Host stackage-build
209209 User curators
210− Hostname ec2-52-5-20-252.compute-1.amazonaws.com
210+ Hostname build.stackage.org
211211```
212212
213213### Running the build script
@@ -279,15 +279,15 @@ Replace nightly with `lts7` to wipe the LTS 7 cache.
279279
280280## Local curator setup
281281
282−We don't run the full stackage build locally as that might take too
282+We do not run the full stackage build locally as that might take too
283283much time. Some steps on the other hand are much faster to do
284284yourself.
285285
286−It's useful to be able to modify constraints locally before pushing to
286+It is useful to be able to modify constraints locally before pushing to
287287the repository. To do this first install stackage-curator:
288288`git clone git@github.com:fpco/stackage-curator.git && cd stackage-curator && stack install`
289289or get the linux binary: https://s3.amazonaws.com/stackage-travis/stackage-curator/stackage-curator.bz2
290−(it's a good idea to upgrade stackage-curator at least at the start of your week as curator).
290+(it is a good idea to upgrade stackage-curator at least at the start of your week as curator).
291291Then clone the stackage repo `git clone git@github.com:fpco/stackage.git`.
292292Inside it run `stack update && stackage-curator check` to get new packages and do dependency resolution.
293293
@@ -295,5 +295,10 @@ This can be used to make sure all version bounds are in place
295295(including for test suites and benchmarks), to check whether bounds
296296can be lifted, and to get `tell-me-when-its-released` notifications.
297297
298−Notably this doesn't build anything, so you won't see any compilation
298+Notably this does not build anything, so you wont see any compilation
299299errors for builds/tests/benchmarks.
300+
301+## Adding new curators
302+
303+1. Add public ssh key to `~/.ssh/authorized_keys` on build server
304+2. Add to fpco/stackage project.
automated/build.sh+1−1
@@ -77,7 +77,7 @@ rm -f stackage-curator stackage-curator.bz2
7777wget https://s3.amazonaws.com/stackage-travis/stackage-curator/stackage-curator.bz2
7878bunzip2 stackage-curator.bz2
7979chmod +x stackage-curator
80−stackage-curator --version
80+./stackage-curator --version
8181)
8282
8383ARGS_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"
build-constraints.yaml+10−1
@@ -2709,6 +2709,16 @@ packages:
27092709 # https://github.com/fpco/stackage/issues/2136
27102710 - X11 < 1.7
27112711
2712+ # https://github.com/fpco/stackage/issues/2177
2713+ - aeson < 1.1.0.0
2714+
2715+ # https://github.com/fpco/stackage/issues/2178
2716+ - hledger < 1.1
2717+ - hledger-lib < 1.1
2718+ - hledger-api < 1.1
2719+ - hledger-ui < 1.1
2720+ - hledger-web < 1.1
2721+
27122722# end of packages
27132723
27142724# Package flags are applied to individual packages, and override the values of
@@ -3040,7 +3050,6 @@ expected-test-failures:
30403050 - dbus # 0.10.12 No issue tracker, e-mail sent to maintainer
30413051 - hspec-expectations-pretty-diff # GHC 8 issue not reported upstream since issue tracker disabled
30423052 - jose-jwt # doctest ambiguity https://github.com/fpco/stackage/issues/2169
3043− - safecopy # time 1.6 https://github.com/acid-state/safecopy/issues/45
30443053 - servant-server # 0.9.1.1 due to hspec-wai-0.8.0 https://github.com/haskell-servant/servant/issues/643
30453054 - sourcemap # https://github.com/chrisdone/sourcemap/issues/3
30463055 - text-ldap # # https://github.com/khibino/haskell-text-ldap/issues/1