Fix travis

Fix release job
Update ghcup.cabal
2021-04-11 19:16:45 +02:00 · 2021-04-11 19:12:55 +02:00 · 2021-04-11 18:14:52 +02:00 · 2021-04-11 18:08:31 +02:00 · 2021-04-11 18:01:31 +02:00 · 2021-04-11 17:58:03 +02:00
4 changed files with 23 additions and 2 deletions
--- a/.gitlab/script/ghcup_release.sh
+++ b/.gitlab/script/ghcup_release.sh
@@ -15,6 +15,11 @@ git describe
 # build
 ecabal update

+(
+	cd /tmp
+	ecabal install -w ghc-${GHC_VERSION} --installdir="$CI_PROJECT_DIR"/.local/bin hspec-discover
+)
+
 if [ "${OS}" = "LINUX" ] ; then
 	if [ "${ARCH}" = "32" ] ; then
 		ecabal build -w ghc-${GHC_VERSION} --ghc-options='-split-sections -optl-static' -ftui -ftar
--- a/.travis/build.sh
+++ b/.travis/build.sh
@@ -16,6 +16,12 @@ ghcup set 8.10.4
 ## install ghcup

 cabal update
+
+(
+	cd /tmp
+	cabal install --installdir="$HOME"/.ghcup/bin hspec-discover
+)
+
 cabal build --constraint="zlib +static" --constraint="lzma +static" -ftui
 cp "$(cabal new-exec --verbose=0 --offline sh -- -c 'command -v ghcup')" .
 strip ./ghcup
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Revision history for ghcup

+## 0.1.14.1 -- 2021-04-11
+
+* Make internal symlink target parser more lax, fixes [#119](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/119)
+* Prepare for hackage release
+
 ## 0.1.14 -- 2021-03-07

 * Major bugfix: fix handling of stray versions wrt [#116](https://gitlab.haskell.org/haskell/ghcup-hs/-/issues/116)
--- a/ghcup.cabal
+++ b/ghcup.cabal
@@ -1,6 +1,6 @@
 cabal-version:   3.0
 name:            ghcup
-version:         0.1.14
+version:         0.1.14.1
 license:         LGPL-3.0-only
 license-file:    LICENSE
 copyright:       Julian Ospald 2020
@@ -8,7 +8,7 @@ maintainer:      hasufell@posteo.de
 author:          Julian Ospald
 homepage:        https://gitlab.haskell.org/haskell/ghcup-hs
 bug-reports:     https://gitlab.haskell.org/haskell/ghcup-hs/issues
-synopsis:        ghc toolchain installer as an exe/library
+synopsis:        ghc toolchain installer
 description:
  A rewrite of the shell script ghcup, for providing
  a more stable user experience and exposing an API.
@@ -16,6 +16,11 @@ description:
 category:        System
 build-type:      Simple
 extra-doc-files: CHANGELOG.md
+                 README.md
+                 HACKING.md
+                 RELEASING.md
+                 config.yaml
+                 ghcup-0.0.4.yaml

 source-repository head
  type:     git
Author	SHA1	Message	Date
Julian Ospald	ffe00c7b1f	Fix travis	2021-04-11 19:16:45 +02:00
Julian Ospald	43114959fd	Fix release job	2021-04-11 19:12:55 +02:00
Julian Ospald	b1c3ffd729	Update ghcup.cabal	2021-04-11 18:14:52 +02:00
Julian Ospald	4f1a9e95a2	Add stuff to extra-doc-files	2021-04-11 18:08:31 +02:00
Julian Ospald	f6a4f55384	Release 0.1.14.1	2021-04-11 18:01:31 +02:00
Julian Ospald	672b179446	Merge branch 'lzma-static'	2021-04-11 17:58:03 +02:00