Skip to content

Bump CI to 9.2.4 and bump some deps #1131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 23, 2022
Merged

Bump CI to 9.2.4 and bump some deps #1131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97dc302
Fix #1128, fix #1130 by adding bounds to Cabal-syntax and haddock-lib…
andreasabel Aug 23, 2022
7ef0d97
Bump CI to 9.2.4 and some deps
andreasabel Aug 23, 2022
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
12 changes: 6 additions & 6 deletions .github/workflows/haskell-ci.yml
View file
Open in desktop
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.15.20220710
# version: 0.15.20220822
#
# REGENDATA ("0.15.20220710",["github","hackage-server.cabal"])
# REGENDATA ("0.15.20220822",["github","hackage-server.cabal"])
#
name: Haskell-CI
on:
Expand All @@ -34,9 +34,9 @@ jobs:
strategy:
matrix:
include:
- compiler: ghc-9.2.3
- compiler: ghc-9.2.4
compilerKind: ghc
compilerVersion: 9.2.3
compilerVersion: 9.2.4
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.0.2
Expand All @@ -62,7 +62,7 @@ jobs:
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
if [ "${{ matrix.setup-method }}" = ghcup ]; then
mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
chmod a+x "$HOME/.ghcup/bin/ghcup"
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
Expand All @@ -73,7 +73,7 @@ jobs:
apt-get update
apt-get install -y "$HCNAME" libbrotli-dev
mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"
curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
chmod a+x "$HOME/.ghcup/bin/ghcup"
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
fi
Expand Down
7 changes: 6 additions & 1 deletion cabal.haskell-ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,9 @@ installed: +all -Cabal -text -parsec
-- Use Ubuntu 20.04
distribution: focal

apt: libbrotli-dev
apt: libbrotli-dev

-- Make sure the haddock step is included,
-- even though we don't define any library.
haddock-components: all
-- since haskell-ci 0.15.20220822
30 changes: 19 additions & 11 deletions hackage-server.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ copyright: 2008-2015 Duncan Coutts,
license: BSD-3-Clause
license-file: LICENSE

tested-with: GHC == { 9.2.3, 9.0.2, 8.10.7, 8.8.4 }
tested-with: GHC == { 9.2.4, 9.0.2, 8.10.7, 8.8.4 }

data-dir: datafiles
data-files:
Expand Down Expand Up @@ -111,13 +111,16 @@ common defaults
, process >= 1.6 && < 1.7
, text ^>= 1.2.5.0 || ^>= 2.0
, time >= 1.9 && < 1.13
, transformers >= 0.5 && < 0.6
, unix >= 2.7 && < 2.8
, transformers >= 0.5 && < 0.7
, unix >= 2.7 && < 2.9
, scientific
-- other dependencies shared by most components
build-depends:
, aeson ^>= 2.0.3.0
, aeson ^>= 2.0.3.0 || ^>= 2.1.0.0
, Cabal ^>= 3.6.3.0
, Cabal-syntax ^>= 3.6.0.0
-- Cabal-syntax needs to be bound to constrain hackage-security
-- see https://github.com/haskell/hackage-server/issues/1130
, fail ^>= 4.9.0
-- we use Control.Monad.Except, introduced in mtl-2.2.1
, network >= 3 && < 3.2
Expand All @@ -126,7 +129,7 @@ common defaults
, parsec ^>= 3.1.13
, tar ^>= 0.5
, unordered-containers ^>= 0.2.10
, vector ^>= 0.12
, vector ^>= 0.12 || ^>= 0.13.0.0
, zlib ^>= 0.6.2

ghc-options: -Wall -fwarn-tabs -fno-warn-unused-do-bind -fno-warn-deprecated-flags -funbox-strict-fields
Expand Down Expand Up @@ -374,7 +377,7 @@ library lib-server
, async ^>= 2.2.1
-- requires bumping http-io-streams
, attoparsec ^>= 0.14.4
, attoparsec-iso8601 ^>= 1.0
, attoparsec-iso8601 ^>= 1.0 || ^>= 1.1.0.0
, base16-bytestring ^>= 1.0
-- requires bumping http-io-streams
, base64-bytestring ^>= 1.2.1.0
Expand All @@ -390,18 +393,23 @@ library lib-server
, cryptohash-sha256 ^>= 0.11.100
, csv ^>= 0.1
, ed25519 ^>= 0.0.5
, hackage-security ^>= 0.6
, hackage-security >= 0.6 && < 0.7
-- N.B: hackage-security-0.6.2 uses Cabal-syntax-3.8.1.0
-- see https://github.com/haskell/hackage-server/issues/1130
-- Thus, we need to include Cabal-syntax as dependency explicitly
, hackage-security-HTTP ^>= 0.1.1
, haddock-library > 1.7 && < 2
, happstack-server ^>= 7.7.1
, hashable ^>= 1.3 || ^>= 1.4
, haddock-library >= 1.7.0 && < 1.11
-- haddock-library-1.11.0 changed type of markupOrderedList
-- see https://github.com/haskell/hackage-server/issues/1128
, happstack-server ^>= 7.7.1 || ^>= 7.8.0
, hashable ^>= 1.3 || ^>= 1.4
, hslogger ^>= 1.3.1
, lifted-base ^>= 0.2.1
, mime-mail ^>= 0.5
, random ^>= 1.2
, rss ^>= 3000.2.0.7
, safecopy ^>= 0.10
, semigroups ^>= 0.19
, semigroups ^>= 0.20
, split ^>= 0.2
, stm ^>= 2.5.0
, tagged ^>= 0.8.5
Expand Down