Merge remote-tracking branch 'origin/stable'

borsboom · borsboom · commit ec395aac9165 · 2018-02-19T04:28:35.000-08:00
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -6,7 +6,7 @@ Question related to stack project templates? Please report it at the [stack-temp
 
 If you're reporting a bug please follow the steps below:
 
-Make sure that you are using the latest release (currently stack-1.6.3).
+Make sure that you are using the latest release (currently stack-1.6.5).
 See the [upgrade instructions](http://docs.haskellstack.org/en/stable/install_and_upgrade/#upgrade) to upgrade.
 
 Please use the following schema for your bug report:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -16,6 +16,15 @@ build:
   stage: build
   only:
     - master
+    - stable
+  script:
+    - export PATH=$HOME/.local/bin:$PATH
+    - (cd etc/scripts && stack --install-ghc install --pedantic)
+    - stack-release-script check
+
+manual_build:
+  stage: build
+  when: manual
   script:
     - export PATH=$HOME/.local/bin:$PATH
     - (cd etc/scripts && stack --install-ghc install --pedantic)
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,12 +1,13 @@
 # Changelog
 
+
 ## Unreleased changes
 
 Release notes:
 
 Major changes:
 
-Behaviour changes:
+Behavior changes:
 
 * `stack setup` no longer uses different GHC configure options on Linux
   distributions that use GCC with PIE enabled by default.  GHC detects
@@ -44,6 +45,12 @@ Other enhancements:
   See [#3857](https://github.com/commercialhaskell/stack/issues/3857)
 
 Bug fixes:
+
+
+
+## v1.6.5
+
+Bug fixes:
 * 1.6.1 introduced a change that made some precompiled cache files use
   longer paths, sometimes causing builds to fail on windows. This has been
   fixed. See [#3649](https://github.com/commercialhaskell/stack/issues/3649)
@@ -93,6 +100,13 @@ Bug fixes:
   [hackage-security #187](https://github.com/haskell/hackage-security/issues/187)
   and [#3073](https://github.com/commercialhaskell/stack/issues/3073).
 
+
+## v1.6.3.1
+
+Hackage-only release with no user facing changes (updated to build with
+newer version of hpack dependency).
+
+
 ## v1.6.3
 
 Enhancements:
diff --git a/stack-nightly.yaml b/stack-nightly.yaml
@@ -1,4 +1,4 @@
-resolver: nightly-2018-02-11
+resolver: nightly-2018-02-18
 packages:
 - .
 - subs/rio
@@ -10,8 +10,6 @@ nix:
     - zlib
     - http-client-tls-0.3.4
 extra-deps:
-- hpack-0.26.0
-
 # https://github.com/commercialhaskell/stack/issues/3785
 - ansi-terminal-0.8.0.1
 - archive: https://github.com/haskell/hackage-security/archive/3297b0f3f4285cb30321baaa7b54e3d22e1f6bd7.tar.gz
