Skip to content

Commit fb5da78

Browse files
ncaqandreasabel
ncaq
and
andreasabel
authored
v0.7.3-r1: allow time-1.14 (#15)
* fix: allow time-1.14 GHC 9.12 time library version is 1.14. > time 1.14 Dependency of ghc library > > [GHC 9.12.20241014](https://downloads.haskell.org/ghc/9.12.1-alpha1/docs/users_guide/9.12.1-notes.html) * fix: limit hspec old version * v0.7.3-r1: CI: include GHC 9.12.1, reactivate Windows CI * Switch off Windows CI for GHCs 8.2 and 8.0 --------- Co-authored-by: Andreas Abel <[email protected]>
1 parent 2a9d772 commit fb5da78

File tree

4 files changed

+37
-62
lines changed

4 files changed

+37
-62
lines changed

.github/workflows/ci.yml.off renamed to .github/workflows/ci.yml

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,29 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15-
os: [ubuntu-latest]
15+
os: [windows-latest]
1616
# Check the haddock step below which is limited to a single GHC version!
1717
ghc:
18+
- '9.12'
1819
- '9.10'
1920
- '9.8'
20-
- '9.6'
21-
- '9.4'
22-
- '9.2'
23-
- '9.0'
24-
- '8.10'
25-
- '8.8'
26-
- '8.6'
21+
# - '9.6'
22+
# - '9.4'
23+
# - '9.2'
24+
# - '9.0'
25+
# - '8.10'
26+
# - '8.8'
27+
# - '8.6'
2728
- '8.4'
28-
- '8.2'
29-
- '8.0'
29+
# hsc2hs fails on windows-2022 for GHCs 8.0 and 8.2
30+
# https://github.com/haskell/hsc2hs/issues/81
31+
# - '8.2'
32+
# - '8.0'
3033
include:
3134
- os: macos-latest
32-
ghc: '9.10'
33-
- os: windows-latest
34-
ghc: '9.10'
35+
ghc: '9.12'
36+
- os: ubuntu-latest
37+
ghc: '9.12'
3538

3639
steps:
3740
- uses: actions/checkout@v4
@@ -60,9 +63,10 @@ jobs:
6063
run: cabal build all --dependencies-only
6164

6265
- run: cabal build all
66+
- run: cabal build all --enable-tests
6367
- run: cabal test all
6468
- run: cabal haddock
65-
if: matrix.ghc == '9.8'
69+
if: matrix.ghc == '9.12'
6670
- run: cabal check
6771
- run: cabal sdist
6872

‎.github/workflows/haskell-ci.yml‎

Lines changed: 9 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
#
77
# haskell-ci regenerate
88
#
9-
# For more information, see https://github.com/andreasabel/haskell-ci
9+
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.19.20241205
11+
# version: 0.19.20241223
1212
#
13-
# REGENDATA ("0.19.20241205",["github","unix-compat.cabal"])
13+
# REGENDATA ("0.19.20241223",["github","unix-compat.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -32,10 +32,10 @@ jobs:
3232
strategy:
3333
matrix:
3434
include:
35-
- compiler: ghc-9.12.0.20241128
35+
- compiler: ghc-9.12.1
3636
compilerKind: ghc
37-
compilerVersion: 9.12.0.20241128
38-
setup-method: ghcup-prerelease
37+
compilerVersion: 9.12.1
38+
setup-method: ghcup
3939
allow-failure: false
4040
- compiler: ghc-9.10.1
4141
compilerKind: ghc
@@ -110,8 +110,8 @@ jobs:
110110
chmod a+x "$HOME/.ghcup/bin/ghcup"
111111
- name: Install cabal-install
112112
run: |
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"
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"
115115
- name: Install GHC (GHCup)
116116
if: matrix.setup-method == 'ghcup'
117117
run: |
@@ -126,21 +126,6 @@ jobs:
126126
HCKIND: ${{ matrix.compilerKind }}
127127
HCNAME: ${{ matrix.compiler }}
128128
HCVER: ${{ matrix.compilerVersion }}
129-
- name: Install GHC (GHCup prerelease)
130-
if: matrix.setup-method == 'ghcup-prerelease'
131-
run: |
132-
"$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.8.yaml;
133-
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
134-
HC=$("$HOME/.ghcup/bin/ghcup" whereis ghc "$HCVER")
135-
HCPKG=$(echo "$HC" | sed 's#ghc$#ghc-pkg#')
136-
HADDOCK=$(echo "$HC" | sed 's#ghc$#haddock#')
137-
echo "HC=$HC" >> "$GITHUB_ENV"
138-
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
139-
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
140-
env:
141-
HCKIND: ${{ matrix.compilerKind }}
142-
HCNAME: ${{ matrix.compiler }}
143-
HCVER: ${{ matrix.compilerVersion }}
144129
- name: Set PATH and environment variables
145130
run: |
146131
echo "$HOME/.cabal/bin" >> $GITHUB_PATH
@@ -151,7 +136,7 @@ jobs:
151136
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
152137
if [ $((HCNUMVER >= 80400)) -ne 0 ] ; then echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" ; else echo "ARG_TESTS=--disable-tests" >> "$GITHUB_ENV" ; fi
153138
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
154-
if [ $((HCNUMVER >= 91200)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
139+
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
155140
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
156141
env:
157142
HCKIND: ${{ matrix.compilerKind }}
@@ -179,18 +164,6 @@ jobs:
179164
repository hackage.haskell.org
180165
url: http://hackage.haskell.org/
181166
EOF
182-
if $HEADHACKAGE; then
183-
cat >> $CABAL_CONFIG <<EOF
184-
repository head.hackage.ghc.haskell.org
185-
url: https://ghc.gitlab.haskell.org/head.hackage/
186-
secure: True
187-
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
188-
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
189-
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
190-
key-threshold: 3
191-
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
192-
EOF
193-
fi
194167
cat >> $CABAL_CONFIG <<EOF
195168
program-default-options
196169
ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -242,9 +215,6 @@ jobs:
242215
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
243216
cat >> cabal.project <<EOF
244217
EOF
245-
if $HEADHACKAGE; then
246-
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
247-
fi
248218
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(unix-compat)$/; }' >> cabal.project.local
249219
cat cabal.project
250220
cat cabal.project.local

‎.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-2024-12-12
26+
resolver: nightly-2025-01-16
2727
- os: macos-latest
2828
ghc: 9.8.4
29-
resolver: lts-23.0
29+
resolver: lts-23.4
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-2024-12-12
38+
resolver: nightly-2025-01-16
3939
- os: windows-latest
4040
ghc: 9.8.4
41-
resolver: lts-23.0
41+
resolver: lts-23.4
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-2024-12-12
48+
resolver: nightly-2025-01-16
4949
- os: ubuntu-latest
5050
ghc: 9.8.4
51-
resolver: lts-23.0
51+
resolver: lts-23.4
5252
- os: ubuntu-latest
5353
ghc: 9.6.6
5454
resolver: lts-22.43

‎unix-compat.cabal‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
cabal-version: >= 1.10
22
name: unix-compat
33
version: 0.7.3
4+
x-revision: 1
45
synopsis: Portable POSIX-compatibility layer.
56
description: This package provides portable implementations of parts
67
of the unix package. This package re-exports the unix
@@ -16,7 +17,7 @@ category: System
1617
build-type: Simple
1718

1819
tested-with:
19-
GHC == 9.12.0
20+
GHC == 9.12.1
2021
GHC == 9.10.1
2122
GHC == 9.8.4
2223
GHC == 9.6.6
@@ -61,7 +62,7 @@ Library
6162
build-depends: Win32 >= 2.5.0.0 && < 3
6263
build-depends: directory >= 1.3.1 && < 1.4
6364
build-depends: filepath >= 1.4.1.0 && < 1.6
64-
build-depends: time >= 1.6.0.1 && < 1.13
65+
build-depends: time >= 1.6.0.1 && < 1.15
6566

6667
other-modules:
6768
System.PosixCompat.Internal.Time
@@ -109,7 +110,7 @@ Test-Suite unix-compat-testsuite
109110
unix-compat
110111
, base
111112
, monad-parallel
112-
, hspec
113+
, hspec >= 2.5.5
113114
, HUnit
114115
, directory >= 1.3.1.0
115116
-- directory-1.3.1.0 adds createFileLink

0 commit comments

Comments
 (0)