Skip to content

Commit 5b3cb4a

Browse files
committed
Merge remote-tracking branch 'upstream/pr/360'
2 parents bd44b64 + 58f2ea9 commit 5b3cb4a

3 files changed

Lines changed: 9 additions & 4 deletions

File tree

.cirrus.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,16 @@ task:
1515
# See https://github.com/anarazel/pg-vm-images/blob/main/packer/openbsd.pkrvars.hcl
1616
image: family/pg-ci-openbsd-vanilla
1717
platform: openbsd
18-
install_script: pkg_add ghc cabal-install git autoconf-2.71
18+
install_script: pkg_add ghc cabal-install git autoconf-2.71p0
1919
script:
2020
- export AUTOCONF_VERSION=2.71
21-
- export CABAL_DIR=/tmp/.cabal
21+
- export CABAL_DIR=/home/cabal
2222
- ghc --version
2323
- cabal --version
2424
- cabal update
2525
- autoreconf -i
26-
- cabal test --test-show-details=direct
26+
# https://github.com/haskellari/splitmix/issues/101
27+
- cabal test --test-show-details=direct -c 'splitmix < 0.1.3 || > 0.1.3.1'
2728

2829
task:
2930
name: NetBSD

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
fail-fast: true
1717
matrix:
1818
os: [ubuntu-24.04, macOS-latest]
19-
ghc: ['9.12', '9.10', '9.8', '9.6', '9.4', '9.2', '9.0', '8.10', '8.8', '8.6']
19+
ghc: ['9.14', '9.12', '9.10', '9.8', '9.6', '9.4', '9.2', '9.0', '8.10', '8.8', '8.6']
2020
exclude:
2121
- os: macos-latest
2222
ghc: '9.0'

cabal.project

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,7 @@ tests: True
44

55
constraints:
66
tasty -unix, optparse-applicative -process
7+
8+
if impl(ghc>=9.14)
9+
constraints: tagged -template-haskell
10+
allow-newer: splitmix:base

0 commit comments

Comments
 (0)