git.iko.soy/stackage
on master help sign in
Update from parent
31b6004orome
.travis.yml+1−1
compare with master
unifiedsplit
@@ -2,7 +2,7 @@
2sudo: false
2sudo: false
3
3
4# Choose a lightweight base image; we provide our own build tools.
4# Choose a lightweight base image; we provide our own build tools.
5−language: c
5+language: generic
6
6
7# GHC depends on GMP. You can add other dependencies here as well.
7# GHC depends on GMP. You can add other dependencies here as well.
8addons:
8addons:
CURATORS.md+10−5
@@ -207,7 +207,7 @@ You'll need to get your SSH public key added to the machine. ~/.ssh/config info:
207```
207```
208Host stackage-build
208Host stackage-build
209 User curators
209 User curators
210− Hostname ec2-52-5-20-252.compute-1.amazonaws.com
210+ Hostname build.stackage.org
211```
211```
212
212
213### Running the build script
213### Running the build script
@@ -279,15 +279,15 @@ Replace nightly with `lts7` to wipe the LTS 7 cache.
279
279
280## Local curator setup
280## Local curator setup
281
281
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
283much time. Some steps on the other hand are much faster to do
283much time. Some steps on the other hand are much faster to do
284yourself.
284yourself.
285
285
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
287the repository. To do this first install stackage-curator:
287the repository. To do this first install stackage-curator:
288`git clone git@github.com:fpco/stackage-curator.git && cd stackage-curator && stack install`
288`git clone git@github.com:fpco/stackage-curator.git && cd stackage-curator && stack install`
289or get the linux binary: https://s3.amazonaws.com/stackage-travis/stackage-curator/stackage-curator.bz2
289or 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).
291Then clone the stackage repo `git clone git@github.com:fpco/stackage.git`.
291Then clone the stackage repo `git clone git@github.com:fpco/stackage.git`.
292Inside it run `stack update && stackage-curator check` to get new packages and do dependency resolution.
292Inside it run `stack update && stackage-curator check` to get new packages and do dependency resolution.
293
293
@@ -295,5 +295,10 @@ This can be used to make sure all version bounds are in place
295(including for test suites and benchmarks), to check whether bounds
295(including for test suites and benchmarks), to check whether bounds
296can be lifted, and to get `tell-me-when-its-released` notifications.
296can be lifted, and to get `tell-me-when-its-released` notifications.
297
297
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
299errors for builds/tests/benchmarks.
299errors 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
77wget https://s3.amazonaws.com/stackage-travis/stackage-curator/stackage-curator.bz2
77wget https://s3.amazonaws.com/stackage-travis/stackage-curator/stackage-curator.bz2
78bunzip2 stackage-curator.bz2
78bunzip2 stackage-curator.bz2
79chmod +x stackage-curator
79chmod +x stackage-curator
80−stackage-curator --version
80+./stackage-curator --version
81)
81)
82
82
83ARGS_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"
83ARGS_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:
2709 # https://github.com/fpco/stackage/issues/2136
2709 # https://github.com/fpco/stackage/issues/2136
2710 - X11 < 1.7
2710 - X11 < 1.7
2711
2711
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+
2712# end of packages
2722# end of packages
2713
2723
2714# Package flags are applied to individual packages, and override the values of
2724# Package flags are applied to individual packages, and override the values of
@@ -3040,7 +3050,6 @@ expected-test-failures:
3040 - dbus # 0.10.12 No issue tracker, e-mail sent to maintainer
3050 - dbus # 0.10.12 No issue tracker, e-mail sent to maintainer
3041 - hspec-expectations-pretty-diff # GHC 8 issue not reported upstream since issue tracker disabled
3051 - hspec-expectations-pretty-diff # GHC 8 issue not reported upstream since issue tracker disabled
3042 - jose-jwt # doctest ambiguity https://github.com/fpco/stackage/issues/2169
3052 - jose-jwt # doctest ambiguity https://github.com/fpco/stackage/issues/2169
3043− - safecopy # time 1.6 https://github.com/acid-state/safecopy/issues/45
3044 - servant-server # 0.9.1.1 due to hspec-wai-0.8.0 https://github.com/haskell-servant/servant/issues/643
3053 - servant-server # 0.9.1.1 due to hspec-wai-0.8.0 https://github.com/haskell-servant/servant/issues/643
3045 - sourcemap # https://github.com/chrisdone/sourcemap/issues/3
3054 - sourcemap # https://github.com/chrisdone/sourcemap/issues/3
3046 - text-ldap # # https://github.com/khibino/haskell-text-ldap/issues/1
3055 - text-ldap # # https://github.com/khibino/haskell-text-ldap/issues/1