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
21 changes: 9 additions & 12 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.20250315
# version: 0.19.20250506
#
# REGENDATA ("0.19.20250315",["github","--config=cabal.haskell-ci","cabal.project"])
# REGENDATA ("0.19.20250506",["github","--config=cabal.haskell-ci","cabal.project"])
#
name: Haskell-CI
on:
Expand All @@ -37,19 +37,19 @@ jobs:
compilerVersion: 9.12.2
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.10.1
- compiler: ghc-9.10.2
compilerKind: ghc
compilerVersion: 9.10.1
compilerVersion: 9.10.2
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 @@ -81,12 +81,12 @@ jobs:
- name: Install GHCup
run: |
mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.40.0/x86_64-linux-ghcup-0.1.40.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.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
- name: Install GHC (GHCup)
if: matrix.setup-method == 'ghcup'
run: |
Expand Down Expand Up @@ -201,9 +201,6 @@ jobs:
echo "package log-postgres" >> cabal.project
echo " ghc-options: -Werror=missing-methods" >> cabal.project
cat >> cabal.project <<EOF
allow-newer: *:base
allow-newer: *:ghc-prim
allow-newer: *:template-haskell
EOF
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(log-base|log-elasticsearch|log-postgres)$/; }' >> cabal.project.local
cat cabal.project
Expand Down
2 changes: 0 additions & 2 deletions cabal.haskell-ci
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
branches: master
doctest: False
tests: True

ghcup-jobs: True
5 changes: 0 additions & 5 deletions cabal.project
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
packages: log-base
, log-elasticsearch
, log-postgres

-- GHC 9.6
allow-newer: *:base
, *:ghc-prim
, *:template-haskell
2 changes: 1 addition & 1 deletion log-base/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# log-base-0.12.1.0 (2025-??-??)
# log-base-0.12.1.0 (2025-06-26)
* Add utility function to log unhandled exceptions.

# log-base-0.12.0.1 (2023-03-14)
Expand Down
2 changes: 1 addition & 1 deletion log-base/log-base.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ copyright: Scrive AB
category: System
build-type: Simple
extra-source-files: CHANGELOG.md, README.md
tested-with: GHC == { 8.10.7, 9.0.2, 9.2.8, 9.4.8, 9.6.6, 9.8.4, 9.10.1, 9.12.2 }
tested-with: GHC == { 8.10.7, 9.0.2, 9.2.8, 9.4.8, 9.6.7, 9.8.4, 9.10.2, 9.12.2 }

source-repository head
type: git
Expand Down
6 changes: 3 additions & 3 deletions log-elasticsearch/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# log-elasticsearch-0.13.0.2 (2025-04-01)
* Switch back to `http-client-tls` by default, and add a constraint
on a more recent version.
# log-elasticsearch-0.13.0.2 (2025-06-26)
* Switch back to `http-client-tls` by default since `HsOpenSSL` is based on a
deprecated `openssl` API (soon to be removed).

# log-elasticsearch-0.13.0.1 (2023-01-31)
* Add support for OpenSearch.
Expand Down
2 changes: 1 addition & 1 deletion log-elasticsearch/log-elasticsearch.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ copyright: Scrive AB
category: System
build-type: Simple
extra-source-files: CHANGELOG.md, README.md
tested-with: GHC == { 8.10.7, 9.0.2, 9.2.8, 9.4.8, 9.6.6, 9.8.4, 9.10.1, 9.12.2 }
tested-with: GHC == { 8.10.7, 9.0.2, 9.2.8, 9.4.8, 9.6.7, 9.8.4, 9.10.2, 9.12.2 }

source-repository head
type: git
Expand Down
2 changes: 1 addition & 1 deletion log-postgres/log-postgres.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ copyright: Scrive AB
category: System
build-type: Simple
extra-source-files: CHANGELOG.md, README.md
tested-with: GHC == { 8.10.7, 9.0.2, 9.2.8, 9.4.8, 9.6.6, 9.8.4, 9.10.1, 9.12.2 }
tested-with: GHC == { 8.10.7, 9.0.2, 9.2.8, 9.4.8, 9.6.7, 9.8.4, 9.10.2, 9.12.2 }

Source-repository head
type: git
Expand Down
Loading