From e4c66198b5ba001685eb4db896e0f2bcb2a4b757 Mon Sep 17 00:00:00 2001 From: Emanuel Borsboom Date: Sun, 2 Dec 2018 14:47:08 -0800 Subject: [PATCH 1/6] etc/dockerfiles: update for stack-1.9.3 --- etc/dockerfiles/stack-build/lts-11.22/Dockerfile | 2 +- etc/dockerfiles/stack-build/lts-12.15/Dockerfile | 14 ++++++++++++++ etc/dockerfiles/stack-build/lts-12.21/Dockerfile | 3 +++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 etc/dockerfiles/stack-build/lts-12.15/Dockerfile create mode 100644 etc/dockerfiles/stack-build/lts-12.21/Dockerfile diff --git a/etc/dockerfiles/stack-build/lts-11.22/Dockerfile b/etc/dockerfiles/stack-build/lts-11.22/Dockerfile index 29c6e03ee2..b2065306ee 100644 --- 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 new file mode 100644 index 0000000000..7d309271af --- /dev/null +++ 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 new file mode 100644 index 0000000000..b8f3e82199 --- /dev/null +++ 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' From 085f630dea63004b85c93e7f8b13189abf23a251 Mon Sep 17 00:00:00 2001 From: Emanuel Borsboom Date: Mon, 3 Dec 2018 02:32:21 -0800 Subject: [PATCH 2/6] Release process updates --- doc/maintainers/releases.md | 2 +- etc/scripts/vagrant-releases.sh | 3 +-- etc/scripts/with-vagrant.sh | 2 +- etc/vagrant/debian-7-amd64/Vagrantfile | 15 --------------- etc/vagrant/debian-7-i386/Vagrantfile | 15 --------------- 5 files changed, 3 insertions(+), 34 deletions(-) diff --git a/doc/maintainers/releases.md b/doc/maintainers/releases.md index 85dc06412c..e3cfbbe899 100644 --- a/doc/maintainers/releases.md +++ b/doc/maintainers/releases.md @@ -4,7 +4,6 @@ ## 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/etc/scripts/vagrant-releases.sh b/etc/scripts/vagrant-releases.sh index a3e0b808b3..47706ce342 100755 --- 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 index d40eaee3f5..2ffee2f8c3 100755 --- 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 index 48abaee1b7..3604490da4 100644 --- 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 index 239787c11f..321aa1bb1a 100644 --- 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 From 9b0e29adfbbbc4191a394e326ce921b6d932860b Mon Sep 17 00:00:00 2001 From: Matt Audesse Date: Sat, 8 Dec 2018 16:43:16 -0500 Subject: [PATCH 3/6] Replace RawGit CDN for doc warning SVG with jsDelivr - see #4436 https://github.com/commercialhaskell/stack/pull/4436 --- doc/GUIDE.md | 2 +- doc/README.md | 2 +- doc/SIGNING_KEY.md | 2 +- doc/architecture.md | 2 +- doc/build_command.md | 2 +- doc/coverage.md | 2 +- doc/custom_snapshot.md | 2 +- doc/dependency_visualization.md | 2 +- doc/docker_integration.md | 2 +- doc/faq.md | 2 +- doc/ghci.md | 2 +- doc/ghcjs.md | 2 +- doc/install_and_upgrade.md | 2 +- doc/maintainers/ghc.md | 2 +- doc/maintainers/msys.md | 2 +- doc/maintainers/releases.md | 2 +- doc/maintainers/team_process.md | 2 +- doc/nix_integration.md | 2 +- doc/nonstandard_project_init.md | 2 +- doc/shell_autocompletion.md | 2 +- doc/stack_yaml_vs_cabal_package_file.md | 2 +- doc/travis_ci.md | 2 +- doc/yaml_configuration.md | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/doc/GUIDE.md b/doc/GUIDE.md index 4e06975fda..3887402053 100644 --- a/doc/GUIDE.md +++ b/doc/GUIDE.md @@ -1,4 +1,4 @@ -
+
# User guide diff --git a/doc/README.md b/doc/README.md index b699c5269b..bcaa531924 100644 --- a/doc/README.md +++ b/doc/README.md @@ -1,4 +1,4 @@ -
+
# The Haskell Tool Stack diff --git a/doc/SIGNING_KEY.md b/doc/SIGNING_KEY.md index d01645cb92..dfeaa130e1 100644 --- a/doc/SIGNING_KEY.md +++ b/doc/SIGNING_KEY.md @@ -1,4 +1,4 @@ -
+
# Signing key diff --git a/doc/architecture.md b/doc/architecture.md index 7eeda7cfe8..2182d2e224 100644 --- a/doc/architecture.md +++ b/doc/architecture.md @@ -1,4 +1,4 @@ -
+
# Architecture diff --git a/doc/build_command.md b/doc/build_command.md index a65f16e384..b22b9ed01f 100644 --- a/doc/build_command.md +++ b/doc/build_command.md @@ -1,4 +1,4 @@ -
+
# Build command diff --git a/doc/coverage.md b/doc/coverage.md index 9c55c480c6..3399863f3c 100644 --- a/doc/coverage.md +++ b/doc/coverage.md @@ -1,4 +1,4 @@ -
+
# Code Coverage diff --git a/doc/custom_snapshot.md b/doc/custom_snapshot.md index 335ff90afc..33f6a6f3d1 100644 --- a/doc/custom_snapshot.md +++ b/doc/custom_snapshot.md @@ -1,4 +1,4 @@ -
+
# Custom Snapshots diff --git a/doc/dependency_visualization.md b/doc/dependency_visualization.md index 795b74a295..00b9e85866 100644 --- a/doc/dependency_visualization.md +++ b/doc/dependency_visualization.md @@ -1,4 +1,4 @@ -
+
# Dependency visualization diff --git a/doc/docker_integration.md b/doc/docker_integration.md index 7afac31a15..b3d6ed2063 100644 --- a/doc/docker_integration.md +++ b/doc/docker_integration.md @@ -1,4 +1,4 @@ -
+
Docker integration =============================================================================== diff --git a/doc/faq.md b/doc/faq.md index 480f32e2aa..fbfe9febca 100644 --- a/doc/faq.md +++ b/doc/faq.md @@ -1,4 +1,4 @@ -
+
# FAQ diff --git a/doc/ghci.md b/doc/ghci.md index a66bcdcf34..1391d3d0b8 100644 --- a/doc/ghci.md +++ b/doc/ghci.md @@ -1,4 +1,4 @@ -
+
# GHCi diff --git a/doc/ghcjs.md b/doc/ghcjs.md index ccbc542faa..15060ad5c5 100644 --- a/doc/ghcjs.md +++ b/doc/ghcjs.md @@ -1,4 +1,4 @@ -
+
# GHCJS (experimental) diff --git a/doc/install_and_upgrade.md b/doc/install_and_upgrade.md index b88a4f5ce4..989c3df7f2 100644 --- a/doc/install_and_upgrade.md +++ b/doc/install_and_upgrade.md @@ -1,4 +1,4 @@ -
+
# Install/upgrade diff --git a/doc/maintainers/ghc.md b/doc/maintainers/ghc.md index 7e05dd6628..23231b0706 100644 --- a/doc/maintainers/ghc.md +++ b/doc/maintainers/ghc.md @@ -1,4 +1,4 @@ -
+
# Adding a new GHC version diff --git a/doc/maintainers/msys.md b/doc/maintainers/msys.md index 3de41a0d4c..5ff7209bba 100644 --- a/doc/maintainers/msys.md +++ b/doc/maintainers/msys.md @@ -1,4 +1,4 @@ -
+
# Upgrading msys diff --git a/doc/maintainers/releases.md b/doc/maintainers/releases.md index e3cfbbe899..ee39d6fc12 100644 --- a/doc/maintainers/releases.md +++ b/doc/maintainers/releases.md @@ -1,4 +1,4 @@ -
+
# Releases diff --git a/doc/maintainers/team_process.md b/doc/maintainers/team_process.md index 84b4b6548d..3ed0d2254e 100644 --- a/doc/maintainers/team_process.md +++ b/doc/maintainers/team_process.md @@ -1,4 +1,4 @@ -
+
# Stack Maintainer Team Process diff --git a/doc/nix_integration.md b/doc/nix_integration.md index 048f627a58..982e698ee3 100644 --- a/doc/nix_integration.md +++ b/doc/nix_integration.md @@ -1,4 +1,4 @@ -
+
# Nix integration diff --git a/doc/nonstandard_project_init.md b/doc/nonstandard_project_init.md index b51f596a79..0797816e1d 100644 --- a/doc/nonstandard_project_init.md +++ b/doc/nonstandard_project_init.md @@ -1,4 +1,4 @@ -
+
# Non-standard project initialization diff --git a/doc/shell_autocompletion.md b/doc/shell_autocompletion.md index 7fdc1f41bf..fce764cd51 100644 --- a/doc/shell_autocompletion.md +++ b/doc/shell_autocompletion.md @@ -1,4 +1,4 @@ -
+
# Shell Auto-completion diff --git a/doc/stack_yaml_vs_cabal_package_file.md b/doc/stack_yaml_vs_cabal_package_file.md index 3f4a08aa0c..91879acfd5 100644 --- a/doc/stack_yaml_vs_cabal_package_file.md +++ b/doc/stack_yaml_vs_cabal_package_file.md @@ -1,4 +1,4 @@ -
+
# stack.yaml vs cabal package file diff --git a/doc/travis_ci.md b/doc/travis_ci.md index 9864779acc..d1e9040b39 100644 --- a/doc/travis_ci.md +++ b/doc/travis_ci.md @@ -1,4 +1,4 @@ -
+
# Travis CI diff --git a/doc/yaml_configuration.md b/doc/yaml_configuration.md index 06f485427b..7e3c0e9832 100644 --- a/doc/yaml_configuration.md +++ b/doc/yaml_configuration.md @@ -1,4 +1,4 @@ -
+
# YAML Configuration From da07b780676d7217baef7dcd02db545ceb988d84 Mon Sep 17 00:00:00 2001 From: dbaynard Date: Thu, 13 Dec 2018 19:37:23 +0000 Subject: [PATCH 4/6] Remove `sudo: false` from travis.yml Support for `sudo: false` will soon be deprecated. Fixes #4442 --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e3c86ad956..492dbddb4e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,6 @@ # use cabal without any Stackage snapshots. # language: generic -sudo: false cache: directories: From 0ff045da8d6e1ce658ad7ba056a794ae1f26c719 Mon Sep 17 00:00:00 2001 From: dbaynard Date: Thu, 13 Dec 2018 19:40:18 +0000 Subject: [PATCH 5/6] Update ChangeLog.md --- ChangeLog.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ChangeLog.md b/ChangeLog.md index e27cff64c4..12780a3532 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -11,6 +11,8 @@ Behavior changes: Other enhancements: +* Travis no longer builds using `sudo: false` as that behaviour is due to be deprecated. + Bug fixes: From c579e83e090d9af57230dddfd5a0c90d93377966 Mon Sep 17 00:00:00 2001 From: dbaynard Date: Thu, 13 Dec 2018 20:01:21 +0000 Subject: [PATCH 6/6] Explicitly set dist: xenial --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 492dbddb4e..ec0ea635d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,6 +8,7 @@ # use cabal without any Stackage snapshots. # language: generic +dist: xenial cache: directories: