Skip to content

Commit 5d459fd

Browse files
Bump cabal file package upper bounds and switch back to Cabal v1-install (#1622)
1 parent b52327b commit 5d459fd

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

.github/workflows/ci-ubuntu.yml

+11-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ on:
3030
## To be experimented with again in the future to see if things have
3131
## gotten better.
3232
##
33+
## We use `v1-install` rather than `install` as Agda as a community
34+
## hasn't figured out how to manage dependencies with the new local
35+
## style builds (see agda/agda#4627 for details). Once this is resolved
36+
## we should upgrade to `install`.
37+
##
3338
## The AGDA variable specifies the command to use to build the library.
3439
## It currently passes the flag `-Werror` to ensure maximal compliance
3540
## with e.g. not relying on deprecated definitions.
@@ -43,7 +48,8 @@ on:
4348
env:
4449
GHC_VERSION: 8.6.5
4550
CABAL_VERSION: 3.2.0.0
46-
CABAL_INSTALL: cabal install --overwrite-policy=always --ghc-options='-O1 +RTS -M6G -RTS'
51+
CABAL_INSTALL: cabal v1-install --ghc-options='-O1 +RTS -M6G -RTS'
52+
# CABAL_INSTALL: cabal install --overwrite-policy=always --ghc-options='-O1 +RTS -M6G -RTS'
4753
AGDA: agda -Werror +RTS -M3.5G -H3.5G -A128M -RTS -i. -i src/
4854

4955
jobs:
@@ -146,6 +152,10 @@ jobs:
146152
${{ env.AGDA }} --safe EverythingSafe.agda
147153
${{ env.AGDA }} index.agda
148154
155+
########################################################################
156+
## DOC DEPLOYMENT
157+
########################################################################
158+
149159
# We start by retrieving the currently deployed docs
150160
# We remove the content that is in the directory we are going to populate
151161
# so that stale files corresponding to deleted modules do not accumulate.

agda-stdlib-utils.cabal

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@ executable GenerateEverything
1717
main-is: GenerateEverything.hs
1818
default-language: Haskell2010
1919
default-extensions: PatternGuards, PatternSynonyms
20-
build-depends: base >= 4.9.0.0 && < 4.16
20+
build-depends: base >= 4.9.0.0 && < 4.17
2121
, directory >= 1.0.0.0 && < 1.4
2222
, filemanip >= 0.3.6.2 && < 0.4
23-
, filepath >= 1.4.1.0 && < 1.5
24-
, mtl >= 2.2.2 && < 2.3
23+
, filepath >= 1.4.1.0 && < 1.5
24+
, mtl >= 2.2.2 && < 2.3
2525

2626
executable AllNonAsciiChars
2727
hs-source-dirs: .
2828
main-is: AllNonAsciiChars.hs
2929
default-language: Haskell2010
30-
build-depends: base >= 4.9.0.0 && < 4.16
30+
build-depends: base >= 4.9.0.0 && < 4.17
3131
, filemanip >= 0.3.6.2 && < 0.4
32-
, text >= 1.2.3.0 && < 1.3
32+
, text >= 1.2.3.0 && < 1.3

0 commit comments

Comments
 (0)