From 59caa9401739f41bb865579b3747d22bd5717e64 Mon Sep 17 00:00:00 2001 From: Mikolaj Konarski Date: Fri, 17 Nov 2023 11:35:22 +0100 Subject: [PATCH] Add more GHC versions to CI --- .github/workflows/haskell.yml | 130 +++++++++++++++++++++------------- Allure.cabal | 2 +- 2 files changed, 81 insertions(+), 51 deletions(-) diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index b233eb30..d75e22fa 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -18,64 +18,124 @@ jobs: strategy: matrix: include: - - compiler: ghc-9.4.1-vanilla + - compiler: ghc-9.8.1-vanilla projectFlags: compilerKind: ghc - compilerVersion: 9.4.1 + compilerVersion: 9.8.1 setup-method: ghcup allow-failure: false - - compiler: ghc-9.4.1-asserts + - compiler: ghc-9.8.1-asserts projectFlags: -fwith_expensive_assertions compilerKind: ghc - compilerVersion: 9.4.1 + compilerVersion: 9.8.1 setup-method: ghcup allow-failure: false - - compiler: ghc-9.4.1-norelease-asserts + - compiler: ghc-9.8.1-norelease-asserts projectFlags: -f-release -fwith_expensive_assertions compilerKind: ghc - compilerVersion: 9.4.1 + compilerVersion: 9.8.1 setup-method: ghcup allow-failure: false - - compiler: ghc-9.4.1-noopt + - compiler: ghc-9.8.1-noopt projectFlags: --ghc-option=-O0 --ghc-option=-fno-ignore-asserts compilerKind: ghc - compilerVersion: 9.4.1 + compilerVersion: 9.8.1 setup-method: ghcup allow-failure: false - - compiler: ghc-9.4.1-opt2 + - compiler: ghc-9.8.1-opt2 projectFlags: --ghc-option=-O2 --ghc-option=-fno-ignore-asserts compilerKind: ghc - compilerVersion: 9.4.1 + compilerVersion: 9.8.1 setup-method: ghcup allow-failure: false - - compiler: ghc-9.2.4-vanilla + - compiler: ghc-9.6.3-vanilla projectFlags: compilerKind: ghc - compilerVersion: 9.2.4 + compilerVersion: 9.6.3 setup-method: ghcup allow-failure: false - - compiler: ghc-9.2.4-asserts + - compiler: ghc-9.6.3-asserts projectFlags: -fwith_expensive_assertions compilerKind: ghc - compilerVersion: 9.2.4 + compilerVersion: 9.6.3 setup-method: ghcup allow-failure: false - - compiler: ghc-9.2.4-norelease-asserts + - compiler: ghc-9.6.3-norelease-asserts projectFlags: -f-release -fwith_expensive_assertions compilerKind: ghc - compilerVersion: 9.2.4 + compilerVersion: 9.6.3 setup-method: ghcup allow-failure: false - - compiler: ghc-9.2.4-noopt + - compiler: ghc-9.6.3-noopt projectFlags: --ghc-option=-O0 --ghc-option=-fno-ignore-asserts compilerKind: ghc - compilerVersion: 9.2.4 + compilerVersion: 9.6.3 setup-method: ghcup allow-failure: false -# OOM - compiler: ghc-9.2.4-opt2 + - compiler: ghc-9.6.3-opt2 + projectFlags: --ghc-option=-O2 --ghc-option=-fno-ignore-asserts + compilerKind: ghc + compilerVersion: 9.6.3 + setup-method: ghcup + allow-failure: false + - compiler: ghc-9.4.8-vanilla + projectFlags: + compilerKind: ghc + compilerVersion: 9.4.8 + setup-method: ghcup + allow-failure: false + - compiler: ghc-9.4.8-asserts + projectFlags: -fwith_expensive_assertions + compilerKind: ghc + compilerVersion: 9.4.8 + setup-method: ghcup + allow-failure: false + - compiler: ghc-9.4.8-norelease-asserts + projectFlags: -f-release -fwith_expensive_assertions + compilerKind: ghc + compilerVersion: 9.4.8 + setup-method: ghcup + allow-failure: false + - compiler: ghc-9.4.8-noopt + projectFlags: --ghc-option=-O0 --ghc-option=-fno-ignore-asserts + compilerKind: ghc + compilerVersion: 9.4.8 + setup-method: ghcup + allow-failure: false + - compiler: ghc-9.4.8-opt2 + projectFlags: --ghc-option=-O2 --ghc-option=-fno-ignore-asserts + compilerKind: ghc + compilerVersion: 9.4.8 + setup-method: ghcup + allow-failure: false + - compiler: ghc-9.2.8-vanilla + projectFlags: + compilerKind: ghc + compilerVersion: 9.2.8 + setup-method: ghcup + allow-failure: false + - compiler: ghc-9.2.8-asserts + projectFlags: -fwith_expensive_assertions + compilerKind: ghc + compilerVersion: 9.2.8 + setup-method: ghcup + allow-failure: false + - compiler: ghc-9.2.8-norelease-asserts + projectFlags: -f-release -fwith_expensive_assertions + compilerKind: ghc + compilerVersion: 9.2.8 + setup-method: ghcup + allow-failure: false + - compiler: ghc-9.2.8-noopt + projectFlags: --ghc-option=-O0 --ghc-option=-fno-ignore-asserts + compilerKind: ghc + compilerVersion: 9.2.8 + setup-method: ghcup + allow-failure: false +# OOM - compiler: ghc-9.2.8-opt2 # projectFlags: --ghc-option=-O2 --ghc-option=-fno-ignore-asserts # compilerKind: ghc -# compilerVersion: 9.2.4 +# compilerVersion: 9.2.8 # setup-method: ghcup # allow-failure: false - compiler: ghc-9.0.2-vanilla @@ -138,36 +198,6 @@ jobs: compilerVersion: 8.10.7 setup-method: ghcup allow-failure: false - - compiler: ghc-8.8.4-vanilla - projectFlags: - compilerKind: ghc - compilerVersion: 8.8.4 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-8.8.4-asserts - projectFlags: -fwith_expensive_assertions - compilerKind: ghc - compilerVersion: 8.8.4 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-8.8.4-norelease-asserts - projectFlags: -f-release -fwith_expensive_assertions - compilerKind: ghc - compilerVersion: 8.8.4 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-8.8.4-noopt - projectFlags: --ghc-option=-O0 --ghc-option=-fno-ignore-asserts - compilerKind: ghc - compilerVersion: 8.8.4 - setup-method: hvr-ppa - allow-failure: false - - compiler: ghc-8.8.4-opt2 - projectFlags: --ghc-option=-O2 --ghc-option=-fno-ignore-asserts - compilerKind: ghc - compilerVersion: 8.8.4 - setup-method: hvr-ppa - allow-failure: false fail-fast: false steps: - name: apt diff --git a/Allure.cabal b/Allure.cabal index e70a667f..35736984 100644 --- a/Allure.cabal +++ b/Allure.cabal @@ -29,7 +29,7 @@ homepage: http://allureofthestars.com bug-reports: http://github.com/AllureOfTheStars/Allure/issues license: AGPL-3.0-or-later license-file: COPYLEFT -tested-with: GHC==8.10.*, GHC==9.0.*, GHC==9.2.*, GHC==9.4.* +tested-with: GHC==8.10.*, GHC==9.0.*, GHC==9.2.*, GHC==9.4.*, GHC==9.6.*, GHC==9.8.* -- Enough files is included in the Hackage package to run CI and manual -- tests off it, to be presentable on Hackage and to create user-friendly -- binary packages.