Skip to content

Commit 8c7fc1d

Browse files
committed
Update to GHC 9.10
1 parent 3612b99 commit 8c7fc1d

File tree

4 files changed

+39
-20
lines changed

4 files changed

+39
-20
lines changed

.github/workflows/haskell.yml

+26-13
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,33 @@ permissions:
1616
jobs:
1717
# Build and test
1818
build:
19-
runs-on: ${{ matrix.os }}
19+
name: "haskell-ci (${{ matrix.ghc }}, ${{ matrix.sys.os }})"
20+
runs-on: ${{ matrix.sys.os }}
2021

2122
strategy:
2223
fail-fast: false
2324
matrix:
24-
ghc: ["8.10.7", "9.2.8", "9.4.8", "9.6.4", "9.8.2"]
25-
cabal: ["3.10.3.0"]
26-
os: [ubuntu-latest, windows-latest, macOS-latest]
25+
ghc: ["8.10", "9.2", "9.4", "9.6", "9.8", "9.10"]
26+
cabal: ["3.12.1.0"]
27+
sys:
28+
- { os: windows-latest, shell: "C:/msys64/usr/bin/bash.exe -e {0}" }
29+
- { os: ubuntu-latest, shell: bash }
30+
- { os: macos-latest, shell: bash }
31+
exclude:
32+
- ghc: "8.10"
33+
sys: { os: macos-latest, shell: bash }
34+
include:
35+
- ghc: "8.10"
36+
cabal: "3.12.1.0"
37+
sys: { os: macos-13, shell: bash }
38+
39+
defaults:
40+
run:
41+
shell: ${{ matrix.sys.shell }}
2742

2843
steps:
2944
- name: Checkout repository
30-
uses: actions/checkout@v3
45+
uses: actions/checkout@v4
3146

3247
- name: "Linux: Install system dependencies (apt-get)"
3348
if: runner.os == 'Linux'
@@ -40,20 +55,18 @@ jobs:
4055
if: runner.os == 'macOS'
4156
run: |
4257
brew update
43-
brew install pkg-config lmdb
58+
brew install lmdb
4459
4560
- name: "Windows: Install system dependencies via pacman (msys2)"
4661
if: runner.os == 'Windows'
4762
run: |
48-
ghcup run -- pacman --noconfirm -S `
49-
mingw-w64-x86_64-pkg-config `
50-
mingw-w64-x86_64-lmdb
63+
/usr/bin/pacman --noconfirm -S mingw-w64-x86_64-pkg-config mingw-w64-x86_64-lmdb
5164
52-
- name: "Windows: Update PATH"
65+
- name: "Windows: update PATH"
5366
if: runner.os == 'Windows'
67+
shell: pwsh
5468
run: |
55-
$env:PATH=("C:\msys64\mingw64\bin;{0}" -f $env:PATH)
56-
echo "PATH=$env:PATH" >> $env:GITHUB_ENV
69+
"PATH=C:\\msys64\\mingw64\\bin;{0}" -f $env:PATH >> $env:GITHUB_ENV
5770
5871
- name: Setup Haskell
5972
id: setup-haskell
@@ -106,4 +119,4 @@ jobs:
106119

107120
- name: Run tests
108121
run: |
109-
cabal test -j1 --test-show-details=direct all
122+
cabal test -j1 all

CHANGELOG.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## next version — ????-??-??
2+
3+
### Patch
4+
5+
* Make it build with GHC `9.10`.
6+
17
## 0.4.0.1 — 2024-04-05
28

39
### Patch
@@ -38,4 +44,4 @@
3844
## 0.3.0.0 — 2023-02-17
3945

4046
First release of `lmdb` fork. See
41-
[INPUT-OUTPUT-FORK.md](./INPUT-OUTPUT-FORK.md).
47+
[INPUT-OUTPUT-FORK.md](./INPUT-OUTPUT-FORK.md).

cabal.project

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
index-state:
22
-- Bump this if you need newer packages from Hackage
33
-- current date: put reason of current date here
4-
, hackage.haskell.org 2024-04-03T11:41:05Z
4+
, hackage.haskell.org 2024-08-15T18:30:21Z
55

66
packages:
7-
.
7+
.

cardano-lmdb.cabal

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ license: BSD-2-Clause
2020
license-file: LICENSE
2121
stability: experimental
2222
build-type: Simple
23-
tested-with: GHC ==8.10 || ==9.2 || ==9.4 || ==9.6 || ==9.8
23+
tested-with: GHC ==8.10 || ==9.2 || ==9.4 || ==9.6 || ==9.8 || ==9.10
2424
extra-doc-files:
2525
CHANGELOG.md
2626
INPUT-OUTPUT-FORK.md
@@ -42,7 +42,7 @@ library
4242
hs-source-dirs: src
4343
default-language: Haskell2010
4444
build-depends:
45-
, base >=4.14 && <4.20
45+
, base >=4.14 && <4.21
4646
, cardano-lmdb:ffi
4747

4848
exposed-modules: Database.LMDB.Raw
@@ -52,7 +52,7 @@ library ffi
5252
visibility: private
5353
hs-source-dirs: src
5454
default-language: Haskell2010
55-
build-depends: base >=4.14 && <4.20
55+
build-depends: base >=4.14 && <4.21
5656
build-tool-depends: hsc2hs:hsc2hs
5757
exposed-modules: Database.LMDB.FFI
5858
pkgconfig-depends: lmdb >=0.9 && <0.10
@@ -65,7 +65,7 @@ test-suite test
6565
main-is: Main.hs
6666
build-depends:
6767
, async
68-
, base >=4.14 && <4.20
68+
, base >=4.14 && <4.21
6969
, cardano-lmdb
7070
, cardano-lmdb:ffi
7171
, tasty

0 commit comments

Comments
 (0)