Skip to content

Commit 86e40d6

Browse files
committed
v0.7.4 WASM support: CHANGELOG, bump CI, clean .cabal file
1 parent 0fb4f1c commit 86e40d6

File tree

4 files changed

+25
-61
lines changed

4 files changed

+25
-61
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#
99
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.19.20241223
11+
# version: 0.19.20250327
1212
#
13-
# REGENDATA ("0.19.20241223",["github","unix-compat.cabal"])
13+
# REGENDATA ("0.19.20250327",["github","unix-compat.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -23,7 +23,7 @@ on:
2323
jobs:
2424
linux:
2525
name: Haskell-CI - Linux - ${{ matrix.compiler }}
26-
runs-on: ubuntu-20.04
26+
runs-on: ubuntu-24.04
2727
timeout-minutes:
2828
60
2929
container:
@@ -32,9 +32,9 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.12.1
35+
- compiler: ghc-9.12.2
3636
compilerKind: ghc
37-
compilerVersion: 9.12.1
37+
compilerVersion: 9.12.2
3838
setup-method: ghcup
3939
allow-failure: false
4040
- compiler: ghc-9.10.1
@@ -47,9 +47,9 @@ jobs:
4747
compilerVersion: 9.8.4
4848
setup-method: ghcup
4949
allow-failure: false
50-
- compiler: ghc-9.6.6
50+
- compiler: ghc-9.6.7
5151
compilerKind: ghc
52-
compilerVersion: 9.6.6
52+
compilerVersion: 9.6.7
5353
setup-method: ghcup
5454
allow-failure: false
5555
- compiler: ghc-9.4.8
@@ -106,12 +106,12 @@ jobs:
106106
- name: Install GHCup
107107
run: |
108108
mkdir -p "$HOME/.ghcup/bin"
109-
curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup"
109+
curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup"
110110
chmod a+x "$HOME/.ghcup/bin/ghcup"
111111
- name: Install cabal-install
112112
run: |
113-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
114-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
113+
"$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
114+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
115115
- name: Install GHC (GHCup)
116116
if: matrix.setup-method == 'ghcup'
117117
run: |

.github/workflows/stack.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ jobs:
2323

2424
- os: macos-latest
2525
ghc: 9.10.1
26-
resolver: nightly-2025-01-16
26+
resolver: nightly-2025-03-27
2727
- os: macos-latest
2828
ghc: 9.8.4
29-
resolver: lts-23.4
29+
resolver: lts-23.14
3030
- os: macos-latest
3131
ghc: 9.2.8
3232
resolver: lts-20.26
@@ -35,20 +35,20 @@ jobs:
3535

3636
- os: windows-latest
3737
ghc: 9.10.1
38-
resolver: nightly-2025-01-16
38+
resolver: nightly-2025-03-27
3939
- os: windows-latest
4040
ghc: 9.8.4
41-
resolver: lts-23.4
41+
resolver: lts-23.14
4242
- os: windows-latest
4343
ghc: 8.4.4
4444
resolver: lts-12.26
4545

4646
- os: ubuntu-latest
4747
ghc: 9.10.1
48-
resolver: nightly-2025-01-16
48+
resolver: nightly-2025-03-27
4949
- os: ubuntu-latest
5050
ghc: 9.8.4
51-
resolver: lts-23.4
51+
resolver: lts-23.14
5252
- os: ubuntu-latest
5353
ghc: 9.6.6
5454
resolver: lts-22.43

CHANGELOG.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
## Unreleased
1+
## Version 0.7.4 (2025-03-27)
22

3-
- Add wasm32-wasi support.
3+
- Add `wasm32-wasi` support
4+
([PR #16](https://github.com/haskell-pkg-janitors/unix-compat/pull/16)).
5+
- Tested with GHC 8.0 - 9.12.
46

57
## Version 0.7.3 (2024-10-11)
68

unix-compat.cabal

Lines changed: 5 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
cabal-version: >= 1.10
1+
cabal-version: 1.18
22
name: unix-compat
3-
version: 0.7.3
4-
x-revision: 1
3+
version: 0.7.4
54
synopsis: Portable POSIX-compatibility layer.
65
description: This package provides portable implementations of parts
76
of the unix package. This package re-exports the unix
@@ -17,10 +16,10 @@ category: System
1716
build-type: Simple
1817

1918
tested-with:
20-
GHC == 9.12.1
19+
GHC == 9.12.2
2120
GHC == 9.10.1
2221
GHC == 9.8.4
23-
GHC == 9.6.6
22+
GHC == 9.6.7
2423
GHC == 9.4.8
2524
GHC == 9.2.8
2625
GHC == 9.0.2
@@ -31,7 +30,7 @@ tested-with:
3130
GHC == 8.2.2
3231
GHC == 8.0.2
3332

34-
extra-source-files:
33+
extra-doc-files:
3534
CHANGELOG.md
3635

3736
source-repository head
@@ -94,21 +93,6 @@ Test-Suite unix-compat-testsuite
9493
LinksSpec
9594
ProcessSpec
9695

97-
-- ghc-options:
98-
-- -Wall
99-
-- -fwarn-tabs
100-
-- -funbox-strict-fields
101-
-- -threaded
102-
-- -fno-warn-unused-do-bind
103-
-- -fno-warn-type-defaults
104-
105-
-- extensions:
106-
-- OverloadedStrings
107-
-- ExtendedDefaultRules
108-
109-
-- if flag(lifted)
110-
-- cpp-options: -DLIFTED
111-
11296
build-depends:
11397
unix-compat
11498
, base
@@ -120,28 +104,6 @@ Test-Suite unix-compat-testsuite
120104
, extra
121105
, temporary
122106

123-
if os(windows)
124-
-- c-sources:
125-
-- cbits/HsUname.c
126-
-- cbits/mktemp.c
127-
128-
-- extra-libraries: msvcrt
129-
-- build-depends: Win32 >= 2.5.0.0
130-
build-depends: time
131-
build-depends: directory
132-
133-
-- other-modules:
134-
-- System.PosixCompat.Internal.Time
135-
136-
else
137-
-- build-depends: unix >= 2.4 && < 2.9
138-
-- include-dirs: include
139-
-- includes: HsUnixCompat.h
140-
-- install-includes: HsUnixCompat.h
141-
-- c-sources: cbits/HsUnixCompat.c
142-
if os(solaris)
143-
cc-options: -DSOLARIS
144-
145107
default-language: Haskell2010
146108
ghc-options:
147109
-Wall

0 commit comments

Comments
 (0)