on master help sign in
Initial 7.10.3 upgrade for Nightly
63aa977Michael Snoyman
.travis.yml+1−1
@@ -13,7 +13,7 @@ install:
13 - chmod +x stack
13 - chmod +x stack
14
14
15 # Install GHC and cabal-install
15 # Install GHC and cabal-install
16− - ./stack setup 7.10.2
16+ - ./stack setup 7.10.3
17 - ./stack --resolver ghc-7.10 build stackage-update
17 - ./stack --resolver ghc-7.10 build stackage-update
18
18
19 # Update the index
19 # Update the index
Dockerfile+3−3
@@ -14,12 +14,12 @@ ADD debian-bootstrap.sh /tmp/debian-bootstrap.sh
14RUN DEBIAN_FRONTEND=noninteractive bash /tmp/debian-bootstrap.sh
14RUN DEBIAN_FRONTEND=noninteractive bash /tmp/debian-bootstrap.sh
15RUN rm /tmp/debian-bootstrap.sh
15RUN rm /tmp/debian-bootstrap.sh
16
16
17−RUN DEBIAN_FRONTEND=noninteractive apt-get install -y cabal-install-1.22 ghc-7.10.2 ghc-7.10.2-htmldocs alex-3.1.3 happy-1.19.4 sudo
17+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y cabal-install-1.22 ghc-7.10.3 ghc-7.10.3-htmldocs alex-3.1.3 happy-1.19.4 sudo
18
18
19−ENV PATH /home/stackage/.cabal/bin:/usr/local/sbin:/usr/local/bin:/opt/ghc/7.10.2/bin:/opt/cabal/1.22/bin:/opt/alex/3.1.3/bin:/opt/happy/1.19.4/bin:/usr/sbin:/usr/bin:/sbin:/bin
19+ENV PATH /home/stackage/.cabal/bin:/usr/local/sbin:/usr/local/bin:/opt/ghc/7.10.3/bin:/opt/cabal/1.22/bin:/opt/alex/3.1.3/bin:/opt/happy/1.19.4/bin:/usr/sbin:/usr/bin:/sbin:/bin
20
20
21RUN cabal update
21RUN cabal update
22RUN cabal install hscolour cabal-install && cp $HOME/.cabal/bin/* /usr/local/bin && rm -rf $HOME/.cabal $HOME/.ghc /tmp/stackage
22RUN cabal install hscolour cabal-install && cp $HOME/.cabal/bin/* /usr/local/bin && rm -rf $HOME/.cabal $HOME/.ghc /tmp/stackage
23RUN wget https://s3.amazonaws.com/stackage-travis/stackage-curator/stackage-curator.bz2 && bunzip2 stackage-curator.bz2 && chmod +x stackage-curator && mv stackage-curator /usr/local/bin
23RUN wget https://s3.amazonaws.com/stackage-travis/stackage-curator/stackage-curator.bz2 && bunzip2 stackage-curator.bz2 && chmod +x stackage-curator && mv stackage-curator /usr/local/bin
24# Get new hyperlinked Haddocks
24# Get new hyperlinked Haddocks
25−RUN mkdir -p /opt/haddock && cd /opt/haddock && wget https://s3.amazonaws.com/download.fpcomplete.com/michael/haddock-2.16.2.tar.gz && tar zxf haddock-2.16.2.tar.gz && rm -f /opt/ghc/7.10.2/bin/haddock && ln -s /opt/haddock/2.16.2/bin/haddock /opt/ghc/7.10.2/bin/haddock
25+# RUN mkdir -p /opt/haddock && cd /opt/haddock && wget https://s3.amazonaws.com/download.fpcomplete.com/michael/haddock-2.16.2.tar.gz && tar zxf haddock-2.16.2.tar.gz && rm -f /opt/ghc/7.10.3/bin/haddock && ln -s /opt/haddock/2.16.2/bin/haddock /opt/ghc/7.10.3/bin/haddock