Skip to content

Commit d444882

Browse files
authored
Merge pull request #51 from input-output-hk/erikd/ghc-9.10
Make it build with ghc-9.10
2 parents 3c46f32 + 0031d69 commit d444882

File tree

3 files changed

+24
-6
lines changed

3 files changed

+24
-6
lines changed

.github/workflows/haskell.yml

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
ghc: ["8.10", "9.2", "9.4", "9.6"]
14+
ghc: ["8.10", "9.2", "9.4", "9.6", "9.10"]
1515
os: [ubuntu-latest, macos-latest, windows-latest]
1616

1717
env:
@@ -25,6 +25,25 @@ jobs:
2525
- name: Set cache version
2626
run: echo "CACHE_VERSION=pu4Aevoo" >> $GITHUB_ENV
2727

28+
- name: Install LLVM (macOS)
29+
if: runner.os == 'macOS' && matrix.ghc == '8.10'
30+
run: |
31+
brew install llvm@13
32+
echo "LLVM_CONFIG=$(brew --prefix llvm@13)/bin/llvm-config" >> $GITHUB_ENV
33+
echo "$(brew --prefix llvm@13)/bin" >> $GITHUB_PATH
34+
35+
- name: Verify LLVM installation
36+
if: runner.os == 'macOS' && matrix.ghc == '8.10'
37+
run: |
38+
llvm-config --version
39+
opt --version
40+
41+
- name: Print environment variables
42+
if: runner.os == 'macOS' && matrix.ghc == '8.10'
43+
run: |
44+
echo "PATH = $PATH"
45+
echo "LLVM_CONFIG = $LLVM_CONFIG"
46+
2847
- name: "Setup Haskell"
2948
uses: haskell-actions/setup@v2
3049
id: setup-haskell
@@ -47,7 +66,7 @@ jobs:
4766
run: |
4867
cabal build all --dry-run
4968
cat dist-newstyle/cache/plan.json | jq -r '."install-plan"[].id' | sort | uniq > dependencies.txt
50-
echo "::set-output name=weeknum::$(/bin/date -u "+%W")"
69+
echo "weeknum=$(/bin/date -u "+%W")" >> $GITHUB_OUTPUT
5170
5271
- uses: actions/cache@v3
5372
name: "Cache cabal store"

cabal.project

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,8 @@ repository cardano-haskell-packages
1111
d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee
1212

1313
index-state:
14-
hackage.haskell.org 2024-02-06T12:00:00Z
15-
, cardano-haskell-packages 2023-05-16T03:39:10Z
16-
14+
hackage.haskell.org 2024-07-01T07:04:30Z
15+
, cardano-haskell-packages 2024-06-27T10:53:24Z
1716

1817
packages: ./typed-protocols
1918
./typed-protocols-cborg

typed-protocols-cborg/typed-protocols-cborg.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ extra-source-files: CHANGELOG.md, README.md
1818
library
1919
exposed-modules: Network.TypedProtocol.Codec.CBOR
2020

21-
build-depends: base >=4.12 && <4.20,
21+
build-depends: base >=4.12 && <4.21,
2222
bytestring >=0.10 && <0.13,
2323
cborg >=0.2.1 && <0.3,
2424

0 commit comments

Comments
 (0)