From 5d459fde9a2a5a40f13a9cc98f0608e7a42ad2cc Mon Sep 17 00:00:00 2001 From: MatthewDaggitt Date: Sat, 20 Nov 2021 14:24:17 +0000 Subject: [PATCH] Bump cabal file package upper bounds and switch back to Cabal v1-install (#1622) --- .github/workflows/ci-ubuntu.yml | 12 +++++++++++- agda-stdlib-utils.cabal | 10 +++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-ubuntu.yml b/.github/workflows/ci-ubuntu.yml index 50fa3980a6..b45b117c8f 100644 --- a/.github/workflows/ci-ubuntu.yml +++ b/.github/workflows/ci-ubuntu.yml @@ -30,6 +30,11 @@ on: ## To be experimented with again in the future to see if things have ## gotten better. ## +## We use `v1-install` rather than `install` as Agda as a community +## hasn't figured out how to manage dependencies with the new local +## style builds (see agda/agda#4627 for details). Once this is resolved +## we should upgrade to `install`. +## ## The AGDA variable specifies the command to use to build the library. ## It currently passes the flag `-Werror` to ensure maximal compliance ## with e.g. not relying on deprecated definitions. @@ -43,7 +48,8 @@ on: env: GHC_VERSION: 8.6.5 CABAL_VERSION: 3.2.0.0 - CABAL_INSTALL: cabal install --overwrite-policy=always --ghc-options='-O1 +RTS -M6G -RTS' + CABAL_INSTALL: cabal v1-install --ghc-options='-O1 +RTS -M6G -RTS' + # CABAL_INSTALL: cabal install --overwrite-policy=always --ghc-options='-O1 +RTS -M6G -RTS' AGDA: agda -Werror +RTS -M3.5G -H3.5G -A128M -RTS -i. -i src/ jobs: @@ -146,6 +152,10 @@ jobs: ${{ env.AGDA }} --safe EverythingSafe.agda ${{ env.AGDA }} index.agda +######################################################################## +## DOC DEPLOYMENT +######################################################################## + # We start by retrieving the currently deployed docs # We remove the content that is in the directory we are going to populate # so that stale files corresponding to deleted modules do not accumulate. diff --git a/agda-stdlib-utils.cabal b/agda-stdlib-utils.cabal index 96fbf2ee2d..06dfa0b0a5 100644 --- a/agda-stdlib-utils.cabal +++ b/agda-stdlib-utils.cabal @@ -17,16 +17,16 @@ executable GenerateEverything main-is: GenerateEverything.hs default-language: Haskell2010 default-extensions: PatternGuards, PatternSynonyms - build-depends: base >= 4.9.0.0 && < 4.16 + build-depends: base >= 4.9.0.0 && < 4.17 , directory >= 1.0.0.0 && < 1.4 , filemanip >= 0.3.6.2 && < 0.4 - , filepath >= 1.4.1.0 && < 1.5 - , mtl >= 2.2.2 && < 2.3 + , filepath >= 1.4.1.0 && < 1.5 + , mtl >= 2.2.2 && < 2.3 executable AllNonAsciiChars hs-source-dirs: . main-is: AllNonAsciiChars.hs default-language: Haskell2010 - build-depends: base >= 4.9.0.0 && < 4.16 + build-depends: base >= 4.9.0.0 && < 4.17 , filemanip >= 0.3.6.2 && < 0.4 - , text >= 1.2.3.0 && < 1.3 + , text >= 1.2.3.0 && < 1.3