Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci-mac-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@ jobs:
fail-fast: false
matrix:
os: [windows-latest, macos-latest]
ghc: ['9.10', '9.8', '9.6', '9.4']
ghc: ['9.14', '9.12', '9.10']
# Minor versions are determined by setup-haskell.
# Use quotes so that the version numbers are not interpreted as floats.
include:
- os: macos-13
- os: macos-15-intel
ghc: '8.0'
- os: windows-latest
ghc: '8.4'
# 2023-02-10: GHCs 8.0 and 8.2 fail to build hsc2hs-0.68.10 on Windows
# see https://github.com/haskell/hsc2hs/issues/81

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6

- uses: haskell-actions/setup@v2
id: setup-haskell
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
run: |
cabal configure -O0 --enable-tests --enable-benchmarks

- uses: actions/cache@v4
- uses: actions/cache@v5
name: Cache dependencies
id: cache
env:
Expand Down
36 changes: 23 additions & 13 deletions .github/workflows/haskell-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#
# For more information, see https://github.com/haskell-CI/haskell-ci
#
# version: 0.19.20250216
# version: 0.19.20260104
#
# REGENDATA ("0.19.20250216",["github","MissingH.cabal"])
# REGENDATA ("0.19.20260104",["github","MissingH.cabal"])
#
name: Haskell-CI
on:
Expand All @@ -20,6 +20,9 @@ on:
pull_request:
branches:
- master
merge_group:
branches:
- master
jobs:
linux:
name: Haskell-CI - Linux - ${{ matrix.compiler }}
Expand All @@ -32,24 +35,29 @@ jobs:
strategy:
matrix:
include:
- compiler: ghc-9.12.1
- compiler: ghc-9.14.1
compilerKind: ghc
compilerVersion: 9.14.1
setup-method: ghcup
allow-failure: false
- 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
- compiler: ghc-9.10.3
compilerKind: ghc
compilerVersion: 9.10.1
compilerVersion: 9.10.3
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.8.4
compilerKind: ghc
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
Expand Down Expand Up @@ -106,12 +114,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.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
"$HOME/.ghcup/bin/ghcup" install cabal 3.16.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
echo "CABAL=$HOME/.ghcup/bin/cabal-3.16.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
- name: Install GHC (GHCup)
if: matrix.setup-method == 'ghcup'
run: |
Expand Down Expand Up @@ -187,7 +195,7 @@ jobs:
chmod a+x $HOME/.cabal/bin/cabal-plan
cabal-plan --version
- name: checkout
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
path: source
- name: initial cabal.project for sdist
Expand All @@ -212,7 +220,9 @@ jobs:
touch cabal.project.local
echo "packages: ${PKGDIR_MissingH}" >> cabal.project
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package MissingH" >> cabal.project ; fi
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project ; fi
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package MissingH" >> cabal.project ; fi
if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi
cat >> cabal.project <<EOF
EOF
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(MissingH)$/; }' >> cabal.project.local
Expand Down
7 changes: 7 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# 1.6.0.3

_Andreas Abel, 2026-01-07_

- Allow `time < 2`
- Tested with GHC 8.0 - 9.14.1

# 1.6.0.2

_Andreas Abel, 2025-03-02_
Expand Down
12 changes: 6 additions & 6 deletions MissingH.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 1.24
name: MissingH
version: 1.6.0.2
version: 1.6.0.3

build-type: Simple
license: BSD3
Expand All @@ -10,10 +10,11 @@ maintainer: Andreas Abel
license-file: LICENSE

tested-with:
GHC == 9.12.1
GHC == 9.10.1
GHC == 9.14.1
GHC == 9.12.2
GHC == 9.10.3
GHC == 9.8.4
GHC == 9.6.6
GHC == 9.6.7
GHC == 9.4.8
GHC == 9.2.8
GHC == 9.0.2
Expand Down Expand Up @@ -139,7 +140,7 @@ library
, parsec == 3.1.* && (< 3.1.12 || >= 3.1.13)
, process >= 1.1.0.1 && < 1.7
, regex-compat >= 0.95.1 && < 0.96
, time >= 1.4 && < 1.15
, time >= 1.4 && < 2

if flag(network--GE-3_0_0)
build-depends: network-bsd >= 2.8.1 && <2.9,
Expand Down Expand Up @@ -199,7 +200,6 @@ test-suite runtests
, old-time
, parsec
, regex-compat
, time

if !os(windows)
build-depends: unix
Expand Down
1 change: 1 addition & 0 deletions cabal.haskell-ci
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
branches: master
installed: +all
error-incomplete-patterns: False

-- constraint-set containers-0.7
-- ghc: >= 8.2
Expand Down
Loading