twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-05-19 03:20:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #897 from xmonad/haskell-ci-update

Browse Source 
ci: Regenerate haskell-ci
This commit is contained in:
Tomáš Janoušek 2024-07-07 15:37:27 +01:00 committed by GitHub
commit 5d285ced1f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/haskell-ci-hackage.patch vendored
View File

@ -42,9 +42,9 @@ set in GitHub repository secrets.
setup-method: ghcup setup-method: ghcup
allow-failure: false allow-failure: false
+ upload: true + upload: true
- compiler: ghc-9.6.5 - compiler: ghc-9.6.6
compilerKind: ghc compilerKind: ghc
compilerVersion: 9.6.5 compilerVersion: 9.6.6
@@ -257,6 +265,10 @@ @@ -257,6 +265,10 @@
- name: haddock - name: haddock
run: | run: |

12
.github/workflows/haskell-ci.yml vendored
View File

@ -8,9 +8,9 @@
# #
# For more information, see https://github.com/haskell-CI/haskell-ci # 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 name: Haskell-CI
on: on:
@ -46,9 +46,9 @@ jobs:
setup-method: ghcup setup-method: ghcup
allow-failure: false allow-failure: false
upload: true upload: true
- compiler: ghc-9.6.5 - compiler: ghc-9.6.6
compilerKind: ghc compilerKind: ghc
compilerVersion: 9.6.5 compilerVersion: 9.6.6
setup-method: ghcup setup-method: ghcup
allow-failure: false allow-failure: false
- compiler: ghc-9.4.8 - 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" 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" chmod a+x "$HOME/.ghcup/bin/ghcup"
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false) "$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 update
apt-get install -y libx11-dev libxext-dev libxft-dev libxinerama-dev libxrandr-dev libxss-dev apt-get install -y libx11-dev libxext-dev libxft-dev libxinerama-dev libxrandr-dev libxss-dev
env: env:
@ -111,7 +111,7 @@ jobs:
echo "HC=$HC" >> "$GITHUB_ENV" echo "HC=$HC" >> "$GITHUB_ENV"
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV" echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
echo "HADDOCK=$HADDOCK" >> "$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))') 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 "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV" echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"

4
xmonad-contrib.cabal
View File

@ -38,7 +38,7 @@ cabal-version: 1.12
build-type: Simple build-type: Simple
bug-reports: https://github.com/xmonad/xmonad-contrib/issues 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 source-repository head
type: git type: git
@ -481,7 +481,7 @@ test-suite tests
XMonad.Util.XUtils XMonad.Util.XUtils
XPrompt XPrompt
hs-source-dirs: tests, . hs-source-dirs: tests, .
build-depends: base build-depends: base >= 4.12 && < 5
, QuickCheck >= 2 , QuickCheck >= 2
, X11 >= 1.10 && < 1.11 , X11 >= 1.10 && < 1.11
, bytestring >= 0.10 && < 0.13 , bytestring >= 0.10 && < 0.13