Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow building with GHC 9.10 #435

Merged
merged 3 commits into from
May 19, 2024
Merged

Allow building with GHC 9.10 #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
443ae36
Allow building with GHC 9.10
jhrcek May 19, 2024
22d8916
Add changelog, bump version
jhrcek May 19, 2024
defa02a
Update stack resolvers in tests
jhrcek May 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/haskell.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ['9.8.2', '9.6.4', '9.4.8', '9.2.8']
ghc: ['9.10.1', '9.8.2', '9.6.5', '9.4.8', '9.2.8']
os: [ubuntu-latest, macOS-latest, windows-latest]

steps:
Expand Down
4 changes: 4 additions & 0 deletions ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# ChangeLog hie-bios

## 2024-05-20 - 0.14.1

* Allow building with GHC 9.10.1 [#435](https://github.com/haskell/hie-bios/pull/435)

## 2024-04-22 - 0.14.0

* Add Loading Style option to 'runAction' [#433](https://github.com/haskell/hie-bios/pull/433)
Expand Down
8 changes: 4 additions & 4 deletions hie-bios.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Cabal-Version: 2.2
Name: hie-bios
Version: 0.14.0
Version: 0.14.1
Author: Matthew Pickering <matthewtpickering@gmail.com>
Maintainer: Matthew Pickering <matthewtpickering@gmail.com>
License: BSD-3-Clause
Expand Down Expand Up @@ -139,7 +139,7 @@ Extra-Source-Files: README.md
tests/projects/stack-with-yaml/stack-with-yaml.cabal
tests/projects/stack-with-yaml/src/Lib.hs

tested-with: GHC ==9.2.8 || ==9.4.8 || ==9.6.4 || ==9.8.2
tested-with: GHC ==9.2.8 || ==9.4.8 || ==9.6.5 || ==9.8.2 || ==9.10.1

Library
Default-Language: Haskell2010
Expand Down Expand Up @@ -173,10 +173,10 @@ Library
cryptohash-sha1 >= 0.11.100 && < 0.12,
directory >= 1.3.0 && < 1.4,
filepath >= 1.4.1 && < 1.6,
time >= 1.8.0 && < 1.14,
time >= 1.8.0 && < 1.15,
extra >= 1.6.14 && < 1.8,
prettyprinter ^>= 1.6 || ^>= 1.7.0,
ghc >= 9.2.1 && < 9.9,
ghc >= 9.2.1 && < 9.11,
transformers >= 0.5.2 && < 0.7,
temporary >= 1.2 && < 1.4,
template-haskell,
Expand Down
4 changes: 2 additions & 2 deletions tests/BiosTests.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
cradleErrorExitCode @?= ExitSuccess
cradleErrorDependencies `shouldMatchList` []
length cradleErrorStderr @?= 1
"Couldn't execute myGhc" `isPrefixOf` head cradleErrorStderr @? "Error message should contain basic information"

Check warning on line 113 in tests/BiosTests.hs

View workflow job for this annotation

GitHub Actions / build (9.10.1, ubuntu-latest) 

In the use of ‘head’

Check warning on line 113 in tests/BiosTests.hs

View workflow job for this annotation

GitHub Actions / build (9.8.2, ubuntu-latest) 

In the use of ‘head’

Check warning on line 113 in tests/BiosTests.hs

View workflow job for this annotation

GitHub Actions / build (9.8.2, macOS-latest) 

In the use of ‘head’

Check warning on line 113 in tests/BiosTests.hs

View workflow job for this annotation

GitHub Actions / build (9.10.1, macOS-latest) 

In the use of ‘head’

Check warning on line 113 in tests/BiosTests.hs

View workflow job for this annotation

GitHub Actions / build (9.10.1, windows-latest) 

In the use of ‘head’

Check warning on line 113 in tests/BiosTests.hs

View workflow job for this annotation

GitHub Actions / build (9.8.2, windows-latest) 

In the use of ‘head’
, testCaseSteps "simple-bios-shell" $ runTestEnv "./simple-bios-shell" $ do
testDirectoryM isBiosCradle "B.hs"
, testCaseSteps "simple-bios-shell-deps" $ runTestEnv "./simple-bios-shell" $ do
Expand Down Expand Up @@ -351,9 +351,9 @@
stackYamlResolver :: String
stackYamlResolver =
#if (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(9,8,0,0)))
"nightly-2024-02-26" -- GHC 9.8.1
"nightly-2024-05-19" -- GHC 9.8.2
#elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(9,6,0,0)))
"lts-22.12" -- GHC 9.6.4
"lts-22.22" -- GHC 9.6.5
#elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(9,4,0,0)))
"lts-21.25" -- GHC 9.4.8
#elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(9,2,0,0)))
Expand Down
Loading