From e8029cb51dcb86ef1cfc3e5d077e5aeebfbc1025 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 6 Jul 2024 03:16:33 +0000 Subject: [PATCH 1/3] ci: Bump GHC patch versions in tested-with --- xmonad-contrib.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal index 838628c29..4b4ed7440 100644 --- a/xmonad-contrib.cabal +++ b/xmonad-contrib.cabal @@ -38,7 +38,7 @@ cabal-version: 1.12 build-type: Simple bug-reports: https://github.com/xmonad/xmonad-contrib/issues -tested-with: GHC == 8.6.5 || == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.8 || == 9.4.8 || == 9.6.5 || == 9.8.2 || == 9.10.1 +tested-with: GHC == 8.6.5 || == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.8 || == 9.4.8 || == 9.6.6 || == 9.8.2 || == 9.10.1 source-repository head type: git From 5f82296536bab4b9063063c8e269e955fcd54932 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 6 Jul 2024 03:16:34 +0000 Subject: [PATCH 2/3] ci: Regenerate haskell-ci --- .github/workflows/haskell-ci-hackage.patch | 4 ++-- .github/workflows/haskell-ci.yml | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/haskell-ci-hackage.patch b/.github/workflows/haskell-ci-hackage.patch index 69c64a12c..105f75b9d 100644 --- a/.github/workflows/haskell-ci-hackage.patch +++ b/.github/workflows/haskell-ci-hackage.patch @@ -42,9 +42,9 @@ set in GitHub repository secrets. setup-method: ghcup allow-failure: false + upload: true - - compiler: ghc-9.6.5 + - compiler: ghc-9.6.6 compilerKind: ghc - compilerVersion: 9.6.5 + compilerVersion: 9.6.6 @@ -257,6 +265,10 @@ - name: haddock run: | diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 5e3fd2cde..be8e216ef 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.19.20240514 +# version: 0.19.20240702 # -# REGENDATA ("0.19.20240514",["github","cabal.project"]) +# REGENDATA ("0.19.20240702",["github","cabal.project"]) # name: Haskell-CI on: @@ -46,9 +46,9 @@ jobs: setup-method: ghcup allow-failure: false upload: true - - compiler: ghc-9.6.5 + - compiler: ghc-9.6.6 compilerKind: ghc - compilerVersion: 9.6.5 + compilerVersion: 9.6.6 setup-method: ghcup allow-failure: false - compiler: ghc-9.4.8 @@ -91,7 +91,7 @@ jobs: curl -sL https://downloads.haskell.org/ghcup/0.1.20.0/x86_64-linux-ghcup-0.1.20.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.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + "$HOME/.ghcup/bin/ghcup" install cabal 3.12.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false) apt-get update apt-get install -y libx11-dev libxext-dev libxft-dev libxinerama-dev libxrandr-dev libxss-dev env: @@ -111,7 +111,7 @@ jobs: echo "HC=$HC" >> "$GITHUB_ENV" echo "HCPKG=$HCPKG" >> "$GITHUB_ENV" echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV" - echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV" + echo "CABAL=$HOME/.ghcup/bin/cabal-3.12.1.0 -vnormal+nowrap" >> "$GITHUB_ENV" HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))') echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV" echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" From 91e59c3651c834493eb1df2721b9a104242e8e44 Mon Sep 17 00:00:00 2001 From: Tomas Janousek Date: Sun, 7 Jul 2024 15:21:34 +0100 Subject: [PATCH 3/3] Add base bounds for test-suite cabal 3.12+ is stricter in its checks. Our test suite doesn't depend on xmonad-contrib (it compiles the modules itself with possibly different preprocessor defines), thus it doesn't inherit its base bounds. See https://github.com/haskell/cabal/issues/10162 --- xmonad-contrib.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal index 4b4ed7440..cb00b4423 100644 --- a/xmonad-contrib.cabal +++ b/xmonad-contrib.cabal @@ -481,7 +481,7 @@ test-suite tests XMonad.Util.XUtils XPrompt hs-source-dirs: tests, . - build-depends: base + build-depends: base >= 4.12 && < 5 , QuickCheck >= 2 , X11 >= 1.10 && < 1.11 , bytestring >= 0.10 && < 0.13