twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-07-28 02:31:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #775 from liskin/ci

Browse Source 
CI maintenance (GHA deprecations, GHC 9.4)
This commit is contained in:
Tomáš Janoušek
2022-10-31 11:45:12 +00:00
committed by GitHub
parent c27a1f0791 6880417911
commit 3d0502f7b6
9 changed files with 34 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,12 +45,12 @@ set in GitHub repository secrets.
- compiler: ghc-8.10.7
compilerKind: ghc
compilerVersion: 8.10.7
@@ -240,8 +240,80 @@
@@ -209,8 +217,80 @@
${CABAL} -vnormal check
- name: haddock
run: |
- $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
+ $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH --haddock-for-hackage --builddir $GITHUB_WORKSPACE/haddock all
- $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all
+ $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH --haddock-for-hackage --builddir $GITHUB_WORKSPACE/haddock all
- name: unconstrained build
run: |
rm -f cabal.project.local

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

@@ -35,9 +35,14 @@ jobs:
strategy:
matrix:
include:
- compiler: ghc-9.2.2
- compiler: ghc-9.4.2
compilerKind: ghc
compilerVersion: 9.2.2
compilerVersion: 9.4.2
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.2.4
compilerKind: ghc
compilerVersion: 9.2.4
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.0.2
@@ -240,7 +245,7 @@ jobs:
${CABAL} -vnormal check
- name: haddock
run: |
$CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH --haddock-for-hackage --builddir $GITHUB_WORKSPACE/haddock all
$CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH --haddock-for-hackage --builddir $GITHUB_WORKSPACE/haddock all
- name: unconstrained build
run: |
rm -f cabal.project.local

4
.github/workflows/nix.yml vendored
View File

@@ -12,7 +12,7 @@ jobs:
contents: read
steps:
- name: Install Nix
uses: cachix/install-nix-action@v13
uses: cachix/install-nix-action@v18
with:
install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install
install_options: '--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve'
@@ -20,7 +20,7 @@ jobs:
experimental-features = nix-command flakes
access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
- name: Clone project
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Build
# "nix build" builds with full optimization and includes a profiling
# build, so just the build of xmonad-contrib itself takes 3 minutes.

2
.github/workflows/packdeps.yml vendored
View File

@@ -13,7 +13,7 @@ jobs:
steps:
- name: Clone project
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Setup Haskell
uses: haskell/actions/setup@v1
with:

37
.github/workflows/stack.yml vendored
View File

@@ -12,31 +12,24 @@ jobs:
fail-fast: false
matrix:
include:
- resolver: lts-12
ghc: 8.4.4
- resolver: lts-12 # GHC 8.4
yaml: stack.yaml
- resolver: lts-12
ghc: 8.4.4
- resolver: lts-12 # GHC 8.4
yaml: stack-master.yaml
- resolver: lts-14
ghc: 8.6.5
- resolver: lts-14 # GHC 8.6
yaml: stack-master.yaml
- resolver: lts-16
ghc: 8.8.4
- resolver: lts-16 # GHC 8.8
yaml: stack-master.yaml
- resolver: lts-18
ghc: 8.10.7
- resolver: lts-18 # GHC 8.10
yaml: stack-master.yaml
- resolver: lts-19
ghc: 9.0.2
- resolver: lts-19 # GHC 9.0
yaml: stack.yaml
- resolver: lts-19
ghc: 9.0.2
- resolver: lts-19 # GHC 9.0
yaml: stack-master.yaml
steps:
- name: Clone project
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Prepare apt sources
run: |
@@ -56,14 +49,6 @@ jobs:
libxss-dev \
#
- name: Install GHC
# use system ghc (if available) in stack, don't waste GH Actions cache space
continue-on-error: true
run: |
set -ex
sudo apt install -y ghc-${{ matrix.ghc }}
echo /opt/ghc/${{ matrix.ghc }}/bin >> $GITHUB_PATH
- name: Refresh caches once a month
id: cache-date
# GHA writes caches on the first miss and then never updates them again;
@@ -71,16 +56,16 @@ jobs:
# date is prefixed with an epoch number to let us manually refresh the
# cache when needed. This is a workaround for https://github.com/actions/cache/issues/2
run: |
echo "::set-output name=date::1-$(date +%Y-%m)"
date +date=1-%Y-%m >> $GITHUB_OUTPUT
- name: Cache Haskell package metadata
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ~/.stack/pantry
key: stack-pantry-${{ runner.os }}-${{ steps.cache-date.outputs.date }}
- name: Cache Haskell dependencies
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
~/.stack/*

5
XMonad/Layout/Groups/Examples.hs
View File

@@ -1,5 +1,8 @@
{-# OPTIONS_GHC -fno-warn-missing-signatures #-}
{-# LANGUAGE MultiParamTypeClasses, Rank2Types, TypeFamilies #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE Rank2Types #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE TypeOperators #-}
-----------------------------------------------------------------------------
-- |

1
XMonad/Util/Parser.hs
View File

@@ -5,6 +5,7 @@
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TypeApplications #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE TypeOperators #-}
--------------------------------------------------------------------
-- |
-- Module : XMonad.Util.Parser

3
cabal.haskell-ci
View File

@@ -14,3 +14,6 @@ raw-project
package xmonad-contrib
flags: +pedantic
ghc-options: -j
-- avoid --haddock-all which overwrites *-docs.tar.gz with tests docs
haddock-components: libs

2
xmonad-contrib.cabal
View File

@@ -38,7 +38,7 @@ cabal-version: 1.12
build-type: Simple
bug-reports: https://github.com/xmonad/xmonad-contrib/issues
tested-with: GHC == 8.4.4 || == 8.6.5 || == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.2
tested-with: GHC == 8.4.4 || == 8.6.5 || == 8.8.4 || == 8.10.7 || == 9.0.2 || == 9.2.4 || == 9.4.2
source-repository head
type: git