Skip to content

Commit 5f6ce4a

Browse files
anka-213jneira
andauthored
Add ghc-9.0.1 to the build release script (#1940)
* Add ghc-9.0.1 to the build release script * ghc9: Enable module-name plugin * Diagrams now supports ghc-9.0.1 * Upgrade cabal in build script * Cache reset updating hackage index Co-authored-by: jneira <[email protected]>
1 parent d4e2a6f commit 5f6ce4a

File tree

3 files changed

+15
-24
lines changed

3 files changed

+15
-24
lines changed

.github/workflows/build.yml

+7-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
ghc: ['8.10.5', '8.10.4', '8.10.3', '8.10.2', '8.8.4', '8.8.3', '8.6.5', '8.6.4']
19+
ghc: ['9.0.1', '8.10.5', '8.10.4', '8.10.3', '8.10.2', '8.8.4', '8.8.3', '8.6.5', '8.6.4']
2020
os: [ubuntu-18.04, macOS-latest, windows-latest]
2121
exclude:
2222
- os: windows-latest
@@ -36,13 +36,17 @@ jobs:
3636
- uses: haskell/actions/setup@v1
3737
with:
3838
ghc-version: ${{ matrix.ghc }}
39-
cabal-version: '3.2'
39+
cabal-version: '3.4'
40+
41+
- if: ${{ matrix.ghc == '9.0.1' }}
42+
name: Use modified cabal.project for ghc9
43+
run: cp cabal-ghc901.project cabal.project
4044

4145
- name: Shorten binary names
4246
run: |
4347
sed -i.bak -e 's/haskell-language-server/hls/g' \
4448
-e 's/haskell_language_server/hls/g' \
45-
haskell-language-server.cabal
49+
haskell-language-server.cabal cabal.project
4650
sed -i.bak -e 's/Paths_haskell_language_server/Paths_hls/g' \
4751
src/**/*.hs exe/*.hs
4852

cabal-ghc901.project

+7-20
Original file line numberDiff line numberDiff line change
@@ -82,21 +82,13 @@ source-repository-package
8282
subdir: lsp-test
8383
-- https://github.com/haskell/lsp/pull/312
8484

85-
source-repository-package
86-
type: git
87-
location: https://github.com/diagrams/active
88-
tag: ca23431a8dfa013992f9164ccc882a3277361f17
89-
-- https://github.com/diagrams/active/pull/36
90-
9185
write-ghc-environment-files: never
9286

93-
index-state: 2021-05-21T05:01:41Z
87+
index-state: 2021-06-21T19:57:32Z
9488

9589
constraints:
96-
-- Diagrams doesn't support optparse-applicative >= 0.16 yet
97-
optparse-applicative < 0.16
9890
-- These plugins doesn't work on GHC9 yet
99-
, haskell-language-server -brittany -class -eval -fourmolu -modulename -ormolu -splice -stylishhaskell -tactic -refineImports
91+
haskell-language-server -brittany -class -eval -fourmolu -ormolu -splice -stylishhaskell -tactic -refineImports
10092

10193

10294
allow-newer:
@@ -112,7 +104,6 @@ allow-newer:
112104
-- multistate:base,
113105
-- ghc-source-gen:ghc,
114106

115-
active:base,
116107
assoc:base,
117108
cryptohash-md5:base,
118109
cryptohash-sha1:base,
@@ -121,17 +112,13 @@ allow-newer:
121112
deepseq:base,
122113
dependent-sum:some,
123114
dependent-sum:constraints,
124-
diagrams-contrib:base,
125-
diagrams-contrib:lens,
126-
diagrams-contrib:random,
127-
diagrams-core:base,
128-
diagrams-core:lens,
129-
diagrams-lib:base,
130-
diagrams-lib:lens,
131115
diagrams-postscript:base,
132116
diagrams-postscript:lens,
133-
diagrams-svg:base,
134-
diagrams-svg:lens,
117+
diagrams-postscript:diagrams-core,
118+
diagrams-postscript:monoid-extras,
119+
diagrams:diagrams-core,
120+
Chart-diagrams:diagrams-core,
121+
SVGFonts:diagrams-core,
135122
dual-tree:base,
136123
-- Does this make any sense?
137124
entropy:Cabal,

cabal.project

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ source-repository-package
3636

3737
write-ghc-environment-files: never
3838

39-
index-state: 2021-05-21T05:01:41Z
39+
index-state: 2021-06-21T19:57:32Z
4040

4141
constraints:
4242
-- Diagrams doesn't support optparse-applicative >= 0.16 yet

0 commit comments

Comments
 (0)