Skip to content

Commit 33f29f8

Browse files
authored
Merge pull request #54 from input-output-hk/coot/io-classes-1.7
Allow to use io-classes-1.7
2 parents 67a9d95 + 9beb94f commit 33f29f8

File tree

4 files changed

+16
-20
lines changed

4 files changed

+16
-20
lines changed

.github/workflows/github-page.yml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Haddock documentation"
1+
name: Haddocks
22

33
on:
44
schedule:
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
haddocks:
10-
name: "Haddocks"
10+
name: Haddocks
1111

1212
runs-on: ${{ matrix.os }}
1313

@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
ghc: ["9.4.4"]
21+
ghc: ["9.10"]
2222
os: [ubuntu-latest]
2323

2424
permissions:
@@ -31,20 +31,16 @@ jobs:
3131

3232
steps:
3333
- name: Checkout ouroboros-network repository
34-
uses: actions/checkout@v3
35-
36-
# we need nix to later build the spec documents
37-
- name: Install Nix
38-
uses: cachix/install-nix-action@v20
34+
uses: actions/checkout@v4
3935

4036
- name: Install Haskell
41-
uses: haskell/actions/setup@v2
37+
uses: haskell-actions/setup@v2
4238
id: setup-haskell
4339
with:
4440
ghc-version: ${{ matrix.ghc }}
45-
cabal-version: '3.10.1.0'
41+
cabal-version: 'head'
4642

47-
- uses: actions/cache@v3
43+
- uses: actions/cache@v4
4844
name: Cache cabal store
4945
with:
5046
path: ${{ steps.setup-haskell.outputs.cabal-store }}
@@ -62,7 +58,7 @@ jobs:
6258
cabal haddock-project --hackage all
6359
6460
- name: Upload artifacts
65-
uses: actions/upload-pages-artifact@v1
61+
uses: actions/upload-pages-artifact@v3
6662
with:
6763
path: ./haddocks
6864

.github/workflows/haskell.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
os: [ubuntu-latest, macos-latest, windows-latest]
1616

1717
env:
18-
CABAL_VERSION: "3.10.1.0"
18+
CABAL_VERSION: "3.12.1.0"
1919

2020
defaults:
2121
run:
@@ -51,7 +51,7 @@ jobs:
5151
ghc-version: ${{ matrix.ghc }}
5252
cabal-version: ${{ env.CABAL_VERSION }}
5353

54-
- uses: actions/checkout@v3
54+
- uses: actions/checkout@v4
5555

5656
- name: "Configure cabal.project.local"
5757
run: |
@@ -68,14 +68,14 @@ jobs:
6868
cat dist-newstyle/cache/plan.json | jq -r '."install-plan"[].id' | sort | uniq > dependencies.txt
6969
echo "weeknum=$(/bin/date -u "+%W")" >> $GITHUB_OUTPUT
7070
71-
- uses: actions/cache@v3
71+
- uses: actions/cache@v4
7272
name: "Cache cabal store"
7373
with:
7474
path: ${{ runner.os == 'Windows' && steps.win-setup-haskell.outputs.cabal-store || steps.setup-haskell.outputs.cabal-store }}
7575
key: cache-dependencies-${{ env.CACHE_VERSION }}-${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('dependencies.txt') }}
7676
restore-keys: cache-dependencies-${{ env.CACHE_VERSION }}-${{ runner.os }}-${{ matrix.ghc }}
7777

78-
- uses: actions/cache@v3
78+
- uses: actions/cache@v4
7979
name: "Cache `dist-newstyle`"
8080
with:
8181
path: |
@@ -123,7 +123,7 @@ jobs:
123123
run: |
124124
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
125125
126-
- uses: actions/cache@v3
126+
- uses: actions/cache@v4
127127
name: "Cache `stylish-haskell`"
128128
with:
129129
path: ~/.cabal/bin/stylish-haskell
@@ -144,7 +144,7 @@ jobs:
144144
which stylish-haskell
145145
stylish-haskell --version
146146
147-
- uses: actions/checkout@v2
147+
- uses: actions/checkout@v4
148148

149149
- name: "Run `stylish-haskell`"
150150
run: |

cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ repository cardano-haskell-packages
1111
d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee
1212

1313
index-state:
14-
hackage.haskell.org 2024-08-27T07:58:31Z
14+
hackage.haskell.org 2024-08-27T18:06:30Z
1515
, cardano-haskell-packages 2024-06-27T10:53:24Z
1616

1717
packages: ./typed-protocols

typed-protocols/typed-protocols.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ library
3232
, TypeOperators
3333
, BangPatterns
3434
build-depends: base,
35-
io-classes ^>= 1.6
35+
io-classes ^>= 1.7
3636

3737
hs-source-dirs: src
3838
default-language: Haskell2010

0 commit comments

Comments
 (0)