Skip to content

Commit f9572bf

Browse files
committed
build with ghc-9.{8,10,12}
Updated `cabal` to `3.14.2.0`.
1 parent 1521906 commit f9572bf

6 files changed

Lines changed: 22 additions & 11 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
ghc: ["8.10.7", "9.2.4", "9.4.2"]
17-
cabal: ["3.8.1.0"]
16+
ghc: ["9.6", "9.8", "9.10", "9.12"]
17+
cabal: ["3.14.2.0"]
1818
os: [windows-latest, ubuntu-latest]
1919

2020
steps:

.github/workflows/github-page.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ jobs:
3030
EOF
3131
3232
- name: Install Haskell
33-
uses: haskell/actions/setup@v1
33+
uses: haskell-actions/setup@v2
3434
id: setup-haskell
3535
with:
3636
ghc-version: ${{ matrix.ghc }}
37-
cabal-version: 3.4.0.0
37+
cabal-version: 3.10.2.0
3838

3939
- name: Set up temp directory
4040
run: |
@@ -57,6 +57,9 @@ jobs:
5757
- name: Configure
5858
run: cabal configure --enable-documentation --enable-tests
5959

60+
- name: cabal build --dry-run
61+
run: cabal build --dry-run all
62+
6063
- name: build Haddock documentation 🔧
6164
run: |
6265
mkdir ./haddocks

NOTICE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2019 Input Output (Hong Kong) Ltd.
1+
Copyright 2019-2023 Input Output Global Ing (IOG), 2023-2026 Intersect
22

33
Licensed under the Apache License, Version 2.0 (the "License");
44
you may not use this file except in compliance with the License.

Win32-network.cabal

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
cabal-version: 2.4
2-
1+
cabal-version: 3.0
32
name: Win32-network
43
version: 0.1.1.1
54
synopsis: Win32 network API
65
license: Apache-2.0
76
license-files: LICENSE NOTICE
87
author: Duncan Coutts, Marcin Szamotulski
98
maintainer: duncan@well-typed.com, marcin.szamotulski@iohk.io
10-
copyright: 2019 Input Output (Hong Kong) Ltd.
9+
copyright: 2019-2023 Input Output Global Inc (IOG), 2023-2026 Intersect
1110
category: System
1211
build-type: Simple
1312
extra-source-files: README.md
1413
ChangeLog.md
1514
include/Win32-network.h
16-
tested-with: GHC==8.10.7, GHC==9.2.4, GHC==9.4.2
15+
tested-with: GHC == {8.10, 9.2, 9.4, 9.6, 9.8}
1716

1817
source-repository head
1918
type: git

demo/named-pipe-demo.hs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{-# LANGUAGE BangPatterns #-}
22
{-# LANGUAGE CPP #-}
3+
{-# LANGUAGE PackageImports #-}
34
{-# LANGUAGE ScopedTypeVariables #-}
45

56
module Main where
@@ -13,7 +14,11 @@ import Control.Exception (finally)
1314
import System.IO hiding (hGetLine)
1415
import System.Exit
1516
import System.Win32 (HANDLE)
16-
import qualified System.Win32.NamedPipes as Win32
17+
#if MIN_VERSION_Win32_nework(2,0,0)
18+
import "Win32-network" qualified System.Win32.NamedPipes as Win32
19+
#else
20+
import "Win32" qualified System.Win32.NamedPipes as Win32
21+
#endif
1722
import qualified System.Win32 as Win32
1823
import qualified System.Win32.Async as Win32
1924
import System.IOManager

test/Test/Async/Socket.hs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1+
{-# LANGUAGE CPP #-}
12
{-# LANGUAGE BangPatterns #-}
23
{-# LANGUAGE NamedFieldPuns #-}
3-
{-# LANGUAGE NumericUnderscores #-}
44
{-# LANGUAGE RankNTypes #-}
55
{-# LANGUAGE ScopedTypeVariables #-}
66
{-# LANGUAGE TypeApplications #-}
77

8+
#if MIN_VERSION_GLASGOW_HASKELL(9,8,0,0)
9+
{-# OPTIONS_GHC -Wno-x-partial #-}
10+
#endif
11+
812
module Test.Async.Socket (tests) where
913

1014
import Control.Exception

0 commit comments

Comments
 (0)