Skip to content

Commit 43d2476

Browse files
committed
enable 9.6 9.8 for bench pipeline
1 parent 79e36f5 commit 43d2476

File tree

4 files changed

+7
-9
lines changed

4 files changed

+7
-9
lines changed

.github/workflows/bench.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ jobs:
4949
ghc:
5050
- '9.2'
5151
- '9.4'
52+
- '9.6'
53+
- '9.8'
5254
os:
5355
- ubuntu-latest
5456

@@ -115,13 +117,13 @@ jobs:
115117
strategy:
116118
fail-fast: false
117119
matrix:
118-
ghc: ['9.2', '9.4']
120+
ghc: ['9.2', '9.4', '9.6', '9.8']
119121
os: [ubuntu-latest]
120122
cabal: ['3.10']
121123
example: ['cabal', 'lsp-types']
122124

123125
steps:
124-
- uses: haskell-actions/[email protected].2
126+
- uses: haskell-actions/[email protected].1
125127
with:
126128
ghc-version : ${{ matrix.ghc }}
127129
cabal-version: ${{ matrix.cabal }}

bench/config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ examples:
2121
# Medium-sized project without TH
2222
- name: cabal
2323
package: Cabal
24-
version: 3.6.3.0
24+
version: 3.10.2.1
2525
modules:
2626
- src/Distribution/Simple.hs
27-
- src/Distribution/Types/Module.hs
27+
- src/Distribution/Types/ComponentLocalBuildInfo.hs
2828
extra-args: [] # extra HLS command line args
2929
# Small-sized project with TH
3030
- name: lsp-types
@@ -129,7 +129,7 @@ versions:
129129
# WARNING: Currently bench versions later than e4234a3a5e347db249fccefb8e3fb36f89e8eafb
130130
# will be unable to send plugin configurations to earlier HLS versions. This causes
131131
# all plugins in those versions to always be enabled.
132-
# In addition bench proactively disables all plugins it knows about besides the
132+
# In addition bench proactively disables all plugins it knows about besides the
133133
# ones in the following list. However because it can only disable plugins it
134134
# knows about, any plugins that are in old versions but were removed from HLS
135135
# before the current bench will not be disabled.

haskell-language-server.cabal

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1835,8 +1835,6 @@ test-suite wrapper-test
18351835
benchmark benchmark
18361836
import: defaults, warnings
18371837
-- Depends on shake-bench which is unbuildable after this point
1838-
if impl(ghc >= 9.5)
1839-
buildable: False
18401838
type: exitcode-stdio-1.0
18411839
ghc-options: -threaded
18421840
main-is: Main.hs

shake-bench/shake-bench.cabal

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ source-repository head
1717

1818
library
1919
-- Depends on Chart which is unbuildable after this point
20-
if impl(ghc >= 9.5)
21-
buildable: False
2220
exposed-modules: Development.Benchmark.Rules
2321
hs-source-dirs: src
2422
build-depends:

0 commit comments

Comments
 (0)