Merge remote-tracking branch 'origin/stable'

vanceism7 · Dec 15, 2018 · caf032b · caf032b
2 parents daa5a44 + 49b2a13
commit caf032b
Show file tree

Hide file tree

Showing 30 changed files with 44 additions and 58 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,7 @@
 # use cabal without any Stackage snapshots.
 #
 language: generic
-sudo: false
+dist: xenial
 
 cache:
     directories:

diff --git a/doc/GUIDE.md b/doc/GUIDE.md
@@ -1,4 +1,4 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://rawgit.com/commercialhaskell/stack/master/doc/img/hidden-warning.svg"></a></div>
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
 
 # User guide
 

diff --git a/doc/README.md b/doc/README.md
@@ -1,4 +1,4 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://rawgit.com/commercialhaskell/stack/master/doc/img/hidden-warning.svg"></a></div>
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
 
 # The Haskell Tool Stack
 

diff --git a/doc/SIGNING_KEY.md b/doc/SIGNING_KEY.md
@@ -1,4 +1,4 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://rawgit.com/commercialhaskell/stack/master/doc/img/hidden-warning.svg"></a></div>
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
 
 # Signing key
 

diff --git a/doc/build_command.md b/doc/build_command.md
@@ -1,4 +1,4 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://rawgit.com/commercialhaskell/stack/master/doc/img/hidden-warning.svg"></a></div>
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
 
 # Build command
 

diff --git a/doc/coverage.md b/doc/coverage.md
@@ -1,4 +1,4 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://rawgit.com/commercialhaskell/stack/master/doc/img/hidden-warning.svg"></a></div>
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
 
 # Code Coverage
 

diff --git a/doc/custom_snapshot.md b/doc/custom_snapshot.md
@@ -1,4 +1,4 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://rawgit.com/commercialhaskell/stack/master/doc/img/hidden-warning.svg"></a></div>
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
 
 # Custom Snapshots
 

diff --git a/doc/dependency_visualization.md b/doc/dependency_visualization.md
@@ -1,4 +1,4 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://rawgit.com/commercialhaskell/stack/master/doc/img/hidden-warning.svg"></a></div>
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
 
 # Dependency visualization
 

diff --git a/doc/docker_integration.md b/doc/docker_integration.md
@@ -1,4 +1,4 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://rawgit.com/commercialhaskell/stack/master/doc/img/hidden-warning.svg"></a></div>
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
 
 Docker integration
 ===============================================================================

diff --git a/doc/faq.md b/doc/faq.md
@@ -1,4 +1,4 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://rawgit.com/commercialhaskell/stack/master/doc/img/hidden-warning.svg"></a></div>
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
 
 # FAQ
 

diff --git a/doc/ghci.md b/doc/ghci.md
@@ -1,4 +1,4 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://rawgit.com/commercialhaskell/stack/master/doc/img/hidden-warning.svg"></a></div>
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
 
 # GHCi
 

diff --git a/doc/ghcjs.md b/doc/ghcjs.md
@@ -1,4 +1,4 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://rawgit.com/commercialhaskell/stack/master/doc/img/hidden-warning.svg"></a></div>
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
 
 # GHCJS (experimental)
 

diff --git a/doc/install_and_upgrade.md b/doc/install_and_upgrade.md
@@ -1,4 +1,4 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://rawgit.com/commercialhaskell/stack/master/doc/img/hidden-warning.svg"></a></div>
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
 
 # Install/upgrade
 

diff --git a/doc/maintainers/ghc.md b/doc/maintainers/ghc.md
@@ -1,4 +1,4 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://rawgit.com/commercialhaskell/stack/master/doc/img/hidden-warning.svg"></a></div>
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
 
 # Adding a new GHC version
 

diff --git a/doc/maintainers/msys.md b/doc/maintainers/msys.md
@@ -1,4 +1,4 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://rawgit.com/commercialhaskell/stack/master/doc/img/hidden-warning.svg"></a></div>
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
 
 # Upgrading msys
 

diff --git a/doc/maintainers/releases.md b/doc/maintainers/releases.md
@@ -1,10 +1,9 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://rawgit.com/commercialhaskell/stack/master/doc/img/hidden-warning.svg"></a></div>
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
 
 # Releases
 
 ## Upcoming release tasks:
 
-* Add back support for building static Linux binaries (by popular demand), and update `get-stack.sh` to use it (see [#4088](https://github.com/commercialhaskell/stack/issues/4088)).
 * Check whether `persistent` still needs `monad-logger`; remove dependency if not
 * Check if workaround for https://github.com/commercialhaskell/stack/issues/3922 still needed in stack.yaml
 * Eventually remove the Ubuntu, Debian, CentOS, Arch packages from our S3 bucket.  This was announced with the 1.9.x release, so can do this around time of 1.11.x.  Directories, and last Stack version uploaded:
@@ -20,6 +19,7 @@
 * Look through https://fpcomplete.slack.com/files/U9U8HDGUC/FCM7UN5NJ/notes_on_doc_maintainers_releases_md.txt for hints on how to make this document more clear.
 * If `store` is no longer a dependency, likely can remove from stackage build constraints' `expected-test-failures`
 
+
 ## Iterating on release process
 
 **IMPORTANT: all bindists for a given release should be built from a consistent git commit** (this can be relaxed a bit for release candidates, but still should be maintained as much as possible).

diff --git a/doc/maintainers/team_process.md b/doc/maintainers/team_process.md
@@ -1,4 +1,4 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://rawgit.com/commercialhaskell/stack/master/doc/img/hidden-warning.svg"></a></div>
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
 
 # Stack Maintainer Team Process
 

diff --git a/doc/nix_integration.md b/doc/nix_integration.md
@@ -1,4 +1,4 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://rawgit.com/commercialhaskell/stack/master/doc/img/hidden-warning.svg"></a></div>
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
 
 # Nix integration
 

diff --git a/doc/nonstandard_project_init.md b/doc/nonstandard_project_init.md
@@ -1,4 +1,4 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://rawgit.com/commercialhaskell/stack/master/doc/img/hidden-warning.svg"></a></div>
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
 
 # Non-standard project initialization
 

diff --git a/doc/shell_autocompletion.md b/doc/shell_autocompletion.md
@@ -1,4 +1,4 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://rawgit.com/commercialhaskell/stack/master/doc/img/hidden-warning.svg"></a></div>
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
 
 # Shell Auto-completion
 

diff --git a/doc/stack_yaml_vs_cabal_package_file.md b/doc/stack_yaml_vs_cabal_package_file.md
@@ -1,4 +1,4 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://rawgit.com/commercialhaskell/stack/master/doc/img/hidden-warning.svg"></a></div>
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
 
 # stack.yaml vs cabal package file
 

diff --git a/doc/travis_ci.md b/doc/travis_ci.md
@@ -1,4 +1,4 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://rawgit.com/commercialhaskell/stack/master/doc/img/hidden-warning.svg"></a></div>
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
 
 # Travis CI
 

diff --git a/doc/yaml_configuration.md b/doc/yaml_configuration.md
@@ -1,4 +1,4 @@
-<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://rawgit.com/commercialhaskell/stack/master/doc/img/hidden-warning.svg"></a></div>
+<div class="hidden-warning"><a href="https://docs.haskellstack.org/"><img src="https://cdn.jsdelivr.net/gh/commercialhaskell/stack/doc/img/hidden-warning.svg"></a></div>
 
 # YAML Configuration
 

diff --git a/etc/dockerfiles/stack-build/lts-11.22/Dockerfile b/etc/dockerfiles/stack-build/lts-11.22/Dockerfile
@@ -1,3 +1,3 @@
 FROM fpco/stack-build:lts-11.6
-ARG STACK_VERSION=1.9.1
+ARG STACK_VERSION=1.9.3
 RUN wget -qO- https://github.com/commercialhaskell/stack/releases/download/v$STACK_VERSION/stack-$STACK_VERSION-linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C /usr/local/bin '*/stack'
diff --git a/etc/dockerfiles/stack-build/lts-12.15/Dockerfile b/etc/dockerfiles/stack-build/lts-12.15/Dockerfile
@@ -0,0 +1,14 @@
+FROM fpco/stack-build:lts-12.0
+ARG STACK_VERSION=1.9.1
+ARG GHC_VERSION=8.4.4
+RUN apt-get update && \
+    apt-get install -y \
+        ghc-$GHC_VERSION \
+        ghc-$GHC_VERSION-dyn \
+        ghc-$GHC_VERSION-htmldocs \
+        ghc-$GHC_VERSION-prof && \
+    rm -rf /var/lib/apt/lists/*
+RUN wget -qO- https://github.com/commercialhaskell/stack/releases/download/v$STACK_VERSION/stack-$STACK_VERSION-linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C /usr/local/bin '*/stack'
+RUN ln -s ghc-$GHC_VERSION /opt/ghc/$GHC_VERSION/share/doc/ghc
+ARG CUDA_VERSION=8.0
+ENV PATH=/root/.cabal/bin:/root/.local/bin:/usr/local/cuda-$CUDA_VERSION/bin:/opt/ghc/$GHC_VERSION/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
diff --git a/etc/dockerfiles/stack-build/lts-12.21/Dockerfile b/etc/dockerfiles/stack-build/lts-12.21/Dockerfile
@@ -0,0 +1,3 @@
+FROM fpco/stack-build:lts-12.15
+ARG STACK_VERSION=1.9.3
+RUN wget -qO- https://github.com/commercialhaskell/stack/releases/download/v$STACK_VERSION/stack-$STACK_VERSION-linux-x86_64.tar.gz | tar xz --wildcards --strip-components=1 -C /usr/local/bin '*/stack'
diff --git a/etc/scripts/vagrant-releases.sh b/etc/scripts/vagrant-releases.sh
@@ -1,9 +1,8 @@
 #!/usr/bin/env bash
 set -xe
 
-cd "$(dirname "$0")/../.."
 #TODO: set up gpg-agent forwarding for package signing (see http://superuser.com/questions/161973/how-can-i-forward-a-gpg-key-via-ssh-agent).
-gpg --export-secret-keys --armor "${STACK_RELEASE_GPG_KEY:-0x575159689BEFB442}" >"gpg-secret-key.asc~"
+gpg --export-secret-keys --armor "${STACK_RELEASE_GPG_KEY:-0x575159689BEFB442}" >"$(dirname "$0")/../../gpg-secret-key.asc~"
 
 "$(dirname "$0")/with-vagrant.sh" debian-7-amd64 "$* release"
 "$(dirname "$0")/with-vagrant.sh" centos-6-x86_64 "--binary-variant=gmp4 $* upload"

diff --git a/etc/scripts/with-vagrant.sh b/etc/scripts/with-vagrant.sh
@@ -10,5 +10,5 @@ vagrant up
 
 vagrant provision
 vagrant rsync
-vagrant ssh -c "set -xe; $3 export GITHUB_AUTH_TOKEN=$GITHUB_AUTH_TOKEN; export STACK_RELEASE_GPG_KEY=${STACK_RELEASE_GPG_KEY:-0x575159689BEFB442}; gpg --import /vagrant/gpg-secret-key.asc~ || true; cd /vagrant-build; for x in CONTRIBUTING ChangeLog; do rm -f doc/\$x.md; ln -s ../\$x.md doc/\$x.md; done; stack /vagrant/etc/scripts/release.hs --no-test-haddocks $2"
+vagrant ssh -c "set -xe; $3 export GITHUB_AUTH_TOKEN=$GITHUB_AUTH_TOKEN; export STACK_RELEASE_GPG_KEY=${STACK_RELEASE_GPG_KEY:-0x575159689BEFB442}; gpg --import /vagrant/gpg-secret-key.asc~ || true; rm -f /vagrant/gpg-secret-key.asc~; cd /vagrant-build; for x in CONTRIBUTING ChangeLog; do rm -f doc/\$x.md; ln -s ../\$x.md doc/\$x.md; done; stack /vagrant/etc/scripts/release.hs --no-test-haddocks $2"
 vagrant halt || vagrant halt -f
diff --git a/etc/vagrant/debian-7-amd64/Vagrantfile b/etc/vagrant/debian-7-amd64/Vagrantfile
@@ -19,20 +19,5 @@ Vagrant.configure(2) do |config|
       chmod +x get_stack.sh
       ./get_stack.sh
     fi
-    if ! which fpm; then
-        apt-get install -y ruby-dev libffi-dev make build-essential
-        apt-get install -y rubygems || true
-        gem install json --version '< 1.8.0'
-        gem install fpm --version '< 1.4.0'
-    fi
-    if ! which deb-s3; then
-        gem install deb-s3
-    fi
-    if ! which aws; then
-        apt-get install -y python2.7
-        curl -O https://bootstrap.pypa.io/get-pip.py
-        sudo python2.7 get-pip.py
-        sudo pip install awscli
-    fi
   SHELL
 end
diff --git a/etc/vagrant/debian-7-i386/Vagrantfile b/etc/vagrant/debian-7-i386/Vagrantfile
@@ -20,20 +20,5 @@ Vagrant.configure(2) do |config|
       ./get_stack.sh
     fi
     chmod a+x /usr/local/bin/stack
-    if ! which fpm; then
-      apt-get install -y ruby-dev libffi-dev make build-essential
-      apt-get install -y rubygems || true
-      gem install json --version '< 1.8.0'
-      gem install fpm --version '< 1.4.0'
-    fi
-    if ! which deb-s3; then
-      gem install deb-s3
-    fi
-    if ! which aws; then
-      apt-get install -y python2.7
-      curl -O https://bootstrap.pypa.io/get-pip.py
-      sudo python2.7 get-pip.py
-      sudo pip install awscli
-    fi
   SHELL
 end