Skip to content
This repository was archived by the owner on Oct 7, 2020. It is now read-only.

Commit b5c1486

Browse files
committed
Add 8.6.2 to dist and update nightly resolver
1 parent df6da63 commit b5c1486

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

Makefile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ icu-macos-fix-build:
174174

175175
# ------------------------------------------------------
176176

177-
HIE_GIT_REF:=$(shell git symbolic-ref -q --short HEAD || git describe --tags --exact-match)
177+
HIE_GIT_REF:=$(shell git describe --tags)
178178
HIE_DIST_NAME:=hie-${HIE_GIT_REF}-`uname -m`-`uname -s`
179179
HIE_DIST_DIR:=/tmp/${HIE_DIST_NAME}
180180
## Creates a tarball containing all the hie binaries
@@ -189,9 +189,13 @@ dist:
189189
stack --stack-yaml=stack-8.4.3.yaml build
190190
cp .stack-work/install/*/*/8.4.3/bin/hie ${HIE_DIST_DIR}/hie-8.4.3
191191
stack --stack-yaml=stack-8.4.4.yaml build
192-
cp .stack-work/install/*/*/8.4.4/bin/hie ${HIE_DIST_DIR}/hie
193192
cp .stack-work/install/*/*/8.4.4/bin/hie ${HIE_DIST_DIR}/hie-8.4.4
194-
cp .stack-work/install/*/*/8.4.4/bin/hie-wrapper ${HIE_DIST_DIR}/hie-wrapper
193+
stack --stack-yaml=stack-8.6.1.yaml build
194+
cp .stack-work/install/*/*/8.6.1/bin/hie ${HIE_DIST_DIR}/hie-8.6.1
195+
stack --stack-yaml=stack-8.6.2.yaml build
196+
cp .stack-work/install/*/*/8.6.2/bin/hie ${HIE_DIST_DIR}/hie-8.6.2
197+
cp .stack-work/install/*/*/8.6.2/bin/hie ${HIE_DIST_DIR}/hie
198+
cp .stack-work/install/*/*/8.6.2/bin/hie-wrapper ${HIE_DIST_DIR}/hie-wrapper
195199
tar -czf ${HIE_DIST_NAME}.tar.gz -C ${HIE_DIST_DIR} .
196200
rm -r ${HIE_DIST_DIR}
197201
.PHONY: dist

stack.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: lts-12.20 # GHC 8.4.4
1+
resolver: nightly-2018-12-01 # GHC 8.6.2
22
packages:
33
- .
44
- hie-plugin-api

0 commit comments

Comments
 (0)