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

Commit 6b606bc

Browse files
alanzalanz
authored
Merge pull request #911 from alanz/ghc-8.4.4
GHC 8.4.4 support
2 parents b39f46f + 4e35f8d commit 6b606bc

File tree

5 files changed

+67
-12
lines changed

5 files changed

+67
-12
lines changed

‎.circleci/config.yml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ defaults: &defaults
2222

2323
- restore_cache:
2424
keys:
25-
- stack-cache-09-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}-{{ checksum "all-cabal.txt" }}
26-
- stack-cache-09-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}
27-
- stack-cache-09-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "resolver.txt" }}
25+
- stack-cache-10-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}-{{ checksum "all-cabal.txt" }}
26+
- stack-cache-10-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}
27+
- stack-cache-10-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "resolver.txt" }}
2828

2929
- run:
3030
name: Stack setup
@@ -50,8 +50,12 @@ defaults: &defaults
5050
name: Generate Hoogle database
5151
command: stack --stack-yaml=${STACK_FILE} exec hoogle generate
5252

53+
- run:
54+
name: Clear cabal-helper cache
55+
command: rm -fr ~/.cache/cabal-helper
56+
5357
- save_cache:
54-
key: stack-cache-09-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "resolver.txt" }}
58+
key: stack-cache-10-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "resolver.txt" }}
5559
paths:
5660
- ~/.stack
5761
- ~/.cache
@@ -72,7 +76,7 @@ defaults: &defaults
7276
path: test-logs
7377

7478
- save_cache:
75-
key: stack-cache-09-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}
79+
key: stack-cache-10-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}
7680
paths:
7781
- ~/.stack
7882
- ~/.cache
@@ -85,7 +89,7 @@ defaults: &defaults
8589
- ~/build/submodules/cabal-helper/.stack-work
8690

8791
- save_cache:
88-
key: stack-cache-09-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}-{{ checksum "all-cabal.txt" }}
92+
key: stack-cache-10-{{ arch }}-{{ .Environment.CIRCLE_JOB }}-{{ checksum "stack-build.txt" }}-{{ checksum "all-cabal.txt" }}
8993
paths:
9094
- ~/.stack
9195
- ~/.cache
@@ -124,6 +128,12 @@ jobs:
124128
- STACK_FILE: "stack-8.4.3.yaml"
125129
<<: *defaults
126130

131+
ghc-8.4.4:
132+
environment:
133+
- STACK_FILE: "stack-8.4.4.yaml"
134+
<<: *defaults
135+
136+
127137
ghc-nightly:
128138
environment:
129139
- STACK_FILE: "stack.yaml"
@@ -170,5 +180,6 @@ workflows:
170180
- ghc-8.2.2
171181
- ghc-8.4.2
172182
- ghc-8.4.3
183+
- ghc-8.4.4
173184
- ghc-nightly
174185
- cabal

‎Makefile

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ STACKLOCALBINDIR:=$(shell stack path --local-bin)
44
all: help
55
.PHONY: all
66

7-
## Builds hie for all supported GHC versions (8.2.1, 8.2.2, 8.4.2 and 8.4.3)
8-
build: hie-8.2.1 hie-8.2.2 hie-8.4.2 hie-8.4.3
7+
## Builds hie for all supported GHC versions (8.2.1, 8.2.2, 8.4.2 and 8.4.3, 8.4.4)
8+
build: hie-8.2.1 hie-8.2.2 hie-8.4.2 hie-8.4.3 hie-8.4.4
99
.PHONY: build
1010

1111
## Builds hie and hoogle databases for all supported GHC versions
@@ -48,6 +48,14 @@ hie-8.4.3: submodules
4848
&& cp '$(STACKLOCALBINDIR)/hie-8.4.3' '$(STACKLOCALBINDIR)/hie-8.4'
4949
.PHONY: hie-8.4.3
5050

51+
## Builds hie for GHC version 8.4.4 only
52+
hie-8.4.4: submodules
53+
stack --stack-yaml=stack-8.4.4.yaml build
54+
stack --stack-yaml=stack-8.4.4.yaml install \
55+
&& cp '$(STACKLOCALBINDIR)/hie' '$(STACKLOCALBINDIR)/hie-8.4.4' \
56+
&& cp '$(STACKLOCALBINDIR)/hie-8.4.4' '$(STACKLOCALBINDIR)/hie-8.4'
57+
.PHONY: hie-8.4.4
58+
5159
# ------------------------------------------------------
5260

5361
## Updates local git submodules

‎stack-8.4.3.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: lts-12.11
1+
resolver: lts-12.14 # Last for GHC 8.4.3
22
packages:
33
- .
44
- hie-plugin-api
@@ -14,7 +14,7 @@ extra-deps:
1414
- cabal-helper-0.8.1.0@rev:0
1515
- cabal-plan-0.3.0.0
1616
- constrained-dynamic-0.1.0.0
17-
- ghc-exactprint-0.5.8.0
17+
- ghc-exactprint-0.5.8.2
1818
- haddock-api-2.20.0
1919
- haddock-library-1.6.0
2020
- hsimport-0.8.6

‎stack-8.4.4.yaml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
resolver: lts-12.15 # LTS 12.15 is first to support GHC 8.4.4
2+
packages:
3+
- .
4+
- hie-plugin-api
5+
6+
extra-deps:
7+
- ./submodules/brittany
8+
- ./submodules/HaRe
9+
- ./submodules/ghc-mod
10+
- ./submodules/ghc-mod/core
11+
- ./submodules/haskell-lsp
12+
- ./submodules/haskell-lsp/haskell-lsp-types
13+
- base-compat-0.9.3
14+
- cabal-helper-0.8.1.0@rev:0
15+
- cabal-plan-0.3.0.0
16+
- constrained-dynamic-0.1.0.0
17+
- ghc-exactprint-0.5.8.2
18+
- haddock-api-2.20.0
19+
- haddock-library-1.6.0
20+
- hsimport-0.8.6
21+
- lsp-test-0.4.0.0
22+
- syz-0.2.0.0
23+
- temporary-1.2.1.1
24+
25+
flags:
26+
haskell-ide-engine:
27+
pedantic: true
28+
hie-plugin-api:
29+
pedantic: true
30+
31+
nix:
32+
packages: [ icu libcxx zlib ]
33+
34+
concurrent-tests: false

‎test/utils/TestUtils.hs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,10 @@ ghc84 = False
129129

130130
stackYaml :: FilePath
131131
stackYaml =
132-
#if (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,4,3,0)))
133-
"stack.yaml"
132+
#if (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,4,4,0)))
133+
"stack-8.4.4.yaml"
134+
#elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,4,3,0)))
135+
"stack-8.4.3.yaml"
134136
#elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,4,2,0)))
135137
"stack-8.4.2.yaml"
136138
#elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,2,2,0)))

0 commit comments

Comments
 (0)