From f9f72f104cfebf98a6bf9cb82cee88e88f8d8aac Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Thu, 27 Mar 2025 15:21:09 +0100 Subject: [PATCH] v0.7.4 WASM support: CHANGELOG, bump CI, clean .cabal file --- .github/workflows/ci.yml | 1 - .github/workflows/haskell-ci.yml | 20 ++++++------- .github/workflows/stack.yml | 14 +++++----- CHANGELOG.md | 6 ++-- unix-compat.cabal | 48 ++++---------------------------- 5 files changed, 26 insertions(+), 63 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 12a02e1..26c5acd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,7 +63,6 @@ jobs: run: cabal build all --dependencies-only - run: cabal build all - - run: cabal build all --enable-tests - run: cabal test all - run: cabal haddock if: matrix.ghc == '9.12' diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 703c5e1..6d2fe73 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.19.20241223 +# version: 0.19.20250327 # -# REGENDATA ("0.19.20241223",["github","unix-compat.cabal"]) +# REGENDATA ("0.19.20250327",["github","unix-compat.cabal"]) # name: Haskell-CI on: @@ -23,7 +23,7 @@ on: jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 timeout-minutes: 60 container: @@ -32,9 +32,9 @@ jobs: strategy: matrix: include: - - compiler: ghc-9.12.1 + - compiler: ghc-9.12.2 compilerKind: ghc - compilerVersion: 9.12.1 + compilerVersion: 9.12.2 setup-method: ghcup allow-failure: false - compiler: ghc-9.10.1 @@ -47,9 +47,9 @@ jobs: compilerVersion: 9.8.4 setup-method: ghcup allow-failure: false - - compiler: ghc-9.6.6 + - compiler: ghc-9.6.7 compilerKind: ghc - compilerVersion: 9.6.6 + compilerVersion: 9.6.7 setup-method: ghcup allow-failure: false - compiler: ghc-9.4.8 @@ -106,12 +106,12 @@ jobs: - name: Install GHCup run: | mkdir -p "$HOME/.ghcup/bin" - curl -sL https://downloads.haskell.org/ghcup/0.1.30.0/x86_64-linux-ghcup-0.1.30.0 > "$HOME/.ghcup/bin/ghcup" + curl -sL https://downloads.haskell.org/ghcup/0.1.50.1/x86_64-linux-ghcup-0.1.50.1 > "$HOME/.ghcup/bin/ghcup" chmod a+x "$HOME/.ghcup/bin/ghcup" - name: Install cabal-install run: | - "$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) - echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" + "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" - name: Install GHC (GHCup) if: matrix.setup-method == 'ghcup' run: | diff --git a/.github/workflows/stack.yml b/.github/workflows/stack.yml index 85ae5b4..251b324 100644 --- a/.github/workflows/stack.yml +++ b/.github/workflows/stack.yml @@ -23,10 +23,10 @@ jobs: - os: macos-latest ghc: 9.10.1 - resolver: nightly-2025-01-16 + resolver: nightly-2025-03-27 - os: macos-latest ghc: 9.8.4 - resolver: lts-23.4 + resolver: lts-23.14 - os: macos-latest ghc: 9.2.8 resolver: lts-20.26 @@ -35,20 +35,20 @@ jobs: - os: windows-latest ghc: 9.10.1 - resolver: nightly-2025-01-16 + resolver: nightly-2025-03-27 - os: windows-latest ghc: 9.8.4 - resolver: lts-23.4 + resolver: lts-23.14 - os: windows-latest ghc: 8.4.4 resolver: lts-12.26 - os: ubuntu-latest ghc: 9.10.1 - resolver: nightly-2025-01-16 + resolver: nightly-2025-03-27 - os: ubuntu-latest ghc: 9.8.4 - resolver: lts-23.4 + resolver: lts-23.14 - os: ubuntu-latest ghc: 9.6.6 resolver: lts-22.43 @@ -162,7 +162,7 @@ jobs: ${{ steps.setup.outputs.stack-root }}/snapshots key: ${{ steps.cache-deps.outputs.cache-primary-key }} - ## Build and test STMonadTrans + ## Build and test ######################################################################## - name: Build w/ tests diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bfbbab..2048251 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ -## Unreleased +## Version 0.7.4 (2025-03-27) - - Add wasm32-wasi support. + - Add `wasm32-wasi` support + ([PR #16](https://github.com/haskell-pkg-janitors/unix-compat/pull/16)). +- Tested with GHC 8.0 - 9.12. ## Version 0.7.3 (2024-10-11) diff --git a/unix-compat.cabal b/unix-compat.cabal index c635e45..aada3a2 100644 --- a/unix-compat.cabal +++ b/unix-compat.cabal @@ -1,7 +1,6 @@ -cabal-version: >= 1.10 +cabal-version: 1.18 name: unix-compat -version: 0.7.3 -x-revision: 1 +version: 0.7.4 synopsis: Portable POSIX-compatibility layer. description: This package provides portable implementations of parts of the unix package. This package re-exports the unix @@ -17,10 +16,10 @@ category: System build-type: Simple tested-with: - GHC == 9.12.1 + GHC == 9.12.2 GHC == 9.10.1 GHC == 9.8.4 - GHC == 9.6.6 + GHC == 9.6.7 GHC == 9.4.8 GHC == 9.2.8 GHC == 9.0.2 @@ -31,7 +30,7 @@ tested-with: GHC == 8.2.2 GHC == 8.0.2 -extra-source-files: +extra-doc-files: CHANGELOG.md source-repository head @@ -94,21 +93,6 @@ Test-Suite unix-compat-testsuite LinksSpec ProcessSpec - -- ghc-options: - -- -Wall - -- -fwarn-tabs - -- -funbox-strict-fields - -- -threaded - -- -fno-warn-unused-do-bind - -- -fno-warn-type-defaults - - -- extensions: - -- OverloadedStrings - -- ExtendedDefaultRules - - -- if flag(lifted) - -- cpp-options: -DLIFTED - build-depends: unix-compat , base @@ -120,28 +104,6 @@ Test-Suite unix-compat-testsuite , extra , temporary - if os(windows) - -- c-sources: - -- cbits/HsUname.c - -- cbits/mktemp.c - - -- extra-libraries: msvcrt - -- build-depends: Win32 >= 2.5.0.0 - build-depends: time - build-depends: directory - - -- other-modules: - -- System.PosixCompat.Internal.Time - - else - -- build-depends: unix >= 2.4 && < 2.9 - -- include-dirs: include - -- includes: HsUnixCompat.h - -- install-includes: HsUnixCompat.h - -- c-sources: cbits/HsUnixCompat.c - if os(solaris) - cc-options: -DSOLARIS - default-language: Haskell2010 ghc-options: -Wall