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

ucd2haskell: Refactor #120

Merged
merged 5 commits into from
Jun 7, 2024
Merged

ucd2haskell: Refactor #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
511bf48
ucd2haskell: Refactor
wismill Jun 7, 2024
1106cf4
ci: Bump GHC, update versions building ucd2haskell
wismill Jun 7, 2024
35e0c50
cabal: update tested-with to match ci
wismill Jun 7, 2024
49a2122
Allow different GHC Unicode version
wismill Jun 7, 2024
4e5ba1d
text: Restrict GHC range to pass the tests
wismill Jun 7, 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
33 changes: 16 additions & 17 deletions .github/workflows/haskell.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ jobs:
- 8.4.4
- 8.6.5
- 8.8.4
- 8.8.4+macOS+exe
- 8.10.7+exe
- 8.8.4+macOS
- 8.10.7
- 9.0.2
- 9.2.8+exe
- 9.4.7
- 9.6.2
- 9.2.8+ucd2haskell
- 9.4.8
- 9.6.5
- 9.8.2
- 9.10.1
- 9.10.1+ucd2haskell
- latest-nightly
- hlint
include:
Expand Down Expand Up @@ -95,16 +95,14 @@ jobs:
cabal_version: 3.2
ignore_error: false

- name: 8.8.4+macOS+exe
- name: 8.8.4+macOS
ghc_version: 8.8.4
pack_options: CABAL_BUILD_OPTIONS="-f ucd2haskell"
runner: macos-latest
cabal_version: 3.2
ignore_error: false

- name: 8.10.7+exe
- name: 8.10.7
ghc_version: 8.10.7
pack_options: CABAL_BUILD_OPTIONS="-f ucd2haskell"
runner: ubuntu-latest
cabal_version: 3.2
ignore_error: false
Expand All @@ -115,22 +113,22 @@ jobs:
cabal_version: 3.2
ignore_error: false

# [NOTE] Last GHC version that can build ucd2haskell
- name: 9.2.8+exe
- name: 9.2.8+ucd2haskell
ghc_version: 9.2.8
# [NOTE] Oldest version supported by ucd2haskell
pack_options: CABAL_BUILD_OPTIONS="-f ucd2haskell"
runner: ubuntu-latest
cabal_version: 3.6
ignore_error: false

- name: 9.4.7
ghc_version: 9.4.7
- name: 9.4.8
ghc_version: 9.4.8
runner: ubuntu-latest
cabal_version: 3.8.1.0
ignore_error: false

- name: 9.6.2
ghc_version: 9.6.2
- name: 9.6.5
ghc_version: 9.6.5
runner: ubuntu-latest
cabal_version: 3.10.1.0
ignore_error: false
Expand All @@ -141,8 +139,9 @@ jobs:
cabal_version: latest
ignore_error: false

- name: 9.10.1
- name: 9.10.1+ucd2haskell
ghc_version: 9.10.1
pack_options: CABAL_BUILD_OPTIONS="-f ucd2haskell"
runner: ubuntu-latest
cabal_version: latest
ignore_error: false
Expand Down
6 changes: 3 additions & 3 deletions experimental/unicode-data-text/test/Unicode/Text/CaseSpec.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ does not match the version of this package.
| 9.0.[1-2] | 4.15.0 | 12.1 |
| 9.2.[1-6] | 4.16.0 | 14.0 |
| 9.4.[1-4] | 4.17.0 | 14.0 |
| 9.6.1 | 4.18.0 | 15.0 |
| 9.6.[1-3] | 4.18.{0,1} | 15.0 |
| 9.6.4-5 | 4.18.2+ | 15.1 |
| 9.8.1 | 4.19.0 | 15.1 |
| 9.10.1 | 4.20.0 | 15.1 |
+-------------+----------------+-----------------+
-}

Expand Down Expand Up @@ -77,5 +79,3 @@ spec = do
#if MIN_VERSION_text(2,0,0)
C.toCaseFold cs `shouldBe` T.toCaseFold cs
#endif


8 changes: 5 additions & 3 deletions experimental/unicode-data-text/unicode-data-text.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@ tested-with: GHC==8.0.2
, GHC==8.10.7
, GHC==9.0.2
, GHC==9.2.8
, GHC==9.4.7
, GHC==9.6.2
, GHC==9.4.8
, GHC==9.6.5
, GHC==9.8.2
, GHC==9.10.1

extra-doc-files:
Changelog.md
Expand Down Expand Up @@ -83,7 +85,7 @@ test-suite test
unicode-data-text
build-tool-depends:
hspec-discover:hspec-discover >= 2.0 && < 2.12
if impl(ghc >= 9.5.1) && impl(ghc < 9.8.0)
if impl(ghc >= 9.5.1) && impl(ghc < 9.6.4)
cpp-options: -DCOMPATIBLE_GHC_UNICODE

benchmark bench
Expand Down
Loading
Loading