Skip to content

Commit

Permalink
Allow text-2.1; bump CI to GHC 9.4.7
Browse files Browse the repository at this point in the history 
Also drop CI support for GHC 7.6 and 7.8
  • Loading branch information
@andreasabel @stevenfontanella
andreasabel authored and stevenfontanella committed Oct 12, 2023
1 parent 4eb1617 commit b1182e6
Show file tree
Hide file tree
Showing 9 changed files with 93 additions and 124 deletions.
53 changes: 13 additions & 40 deletions .github/workflows/haskell-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,47 +6,45 @@
#
# haskell-ci regenerate
#
# For more information, see https://github.com/haskell-CI/haskell-ci
# For more information, see https://github.com/andreasabel/haskell-ci
#
# version: 0.17.20230817
# version: 0.17.20231010
#
# REGENDATA ("0.17.20230817",["github","cabal.project"])
# REGENDATA ("0.17.20231010",["github","cabal.project"])
#
name: Haskell-CI
on:
push:
branches:
- master
- ci*
pull_request:
branches:
- master
- ci*
jobs:
linux:
name: Haskell-CI - Linux - ${{ matrix.compiler }}
runs-on: ubuntu-20.04
timeout-minutes:
60
container:
image: buildpack-deps:bionic
image: buildpack-deps:focal
continue-on-error: ${{ matrix.allow-failure }}
strategy:
matrix:
include:
- compiler: ghc-9.8.0.20230809
- compiler: ghc-9.8.1
compilerKind: ghc
compilerVersion: 9.8.0.20230809
compilerVersion: 9.8.1
setup-method: ghcup
allow-failure: true
- compiler: ghc-9.6.2
allow-failure: false
- compiler: ghc-9.6.3
compilerKind: ghc
compilerVersion: 9.6.2
compilerVersion: 9.6.3
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.4.6
- compiler: ghc-9.4.7
compilerKind: ghc
compilerVersion: 9.4.6
compilerVersion: 9.4.7
setup-method: ghcup
allow-failure: false
- compiler: ghc-9.2.8
Expand Down Expand Up @@ -94,16 +92,6 @@ jobs:
compilerVersion: 7.10.3
setup-method: hvr-ppa
allow-failure: false
- compiler: ghc-7.8.4
compilerKind: ghc
compilerVersion: 7.8.4
setup-method: hvr-ppa
allow-failure: false
- compiler: ghc-7.6.3
compilerKind: ghc
compilerVersion: 7.6.3
setup-method: hvr-ppa
allow-failure: false
fail-fast: false
steps:
- name: apt
Expand Down Expand Up @@ -158,7 +146,7 @@ jobs:
echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
if [ $((HCNUMVER >= 90800)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
echo "GHCJSARITH=0" >> "$GITHUB_ENV"
env:
Expand Down Expand Up @@ -187,18 +175,6 @@ jobs:
repository hackage.haskell.org
url: http://hackage.haskell.org/
EOF
if $HEADHACKAGE; then
cat >> $CABAL_CONFIG <<EOF
repository head.hackage.ghc.haskell.org
url: https://ghc.gitlab.haskell.org/head.hackage/
secure: True
root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
key-threshold: 3
active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
EOF
fi
cat >> $CABAL_CONFIG <<EOF
program-default-options
ghc-options: $GHCJOBS +RTS -M3G -RTS
Expand All @@ -222,7 +198,7 @@ jobs:
chmod a+x $HOME/.cabal/bin/cabal-plan
cabal-plan --version
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: source
- name: initial cabal.project for sdist
Expand Down Expand Up @@ -280,9 +256,6 @@ jobs:
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
cat >> cabal.project <<EOF
EOF
if $HEADHACKAGE; then
echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
fi
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(microlens|microlens-contra|microlens-ghc|microlens-mtl|microlens-platform|microlens-th)$/; }' >> cabal.project.local
cat cabal.project
cat cabal.project.local
Expand Down
7 changes: 4 additions & 3 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
dist/
dist-newstyle/
cabal-dev
.stack-work/
.ghc.environment.*
*.o
*.hi
*.chi
Expand All @@ -10,9 +11,9 @@ cabal-dev
.cabal-sandbox/
cabal.sandbox.config
cabal.config
cabal-dev
stack*.yaml.lock
TAGS
.DS_Store
*~
*#
.stack-work/
dist-newstyle/
3 changes: 2 additions & 1 deletion cabal.haskell-ci
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
branches: master ci*
branches: master

haddock: <8.1 || >8.3

25 changes: 12 additions & 13 deletions microlens-contra/microlens-contra.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,19 @@ build-type: Simple
extra-source-files:
CHANGELOG.md
cabal-version: >=1.10
tested-with: GHC==7.6.3
GHC==7.8.4
GHC==7.10.3
GHC==8.0.2
GHC==8.2.2
GHC==8.4.4
GHC==8.6.5
GHC==8.8.4
GHC==8.10.7
GHC==9.0.2
tested-with:
GHC==9.8.1
GHC==9.6.3
GHC==9.4.7
GHC==9.2.8
GHC==9.4.6
GHC==9.6.2
GHC==9.8.0
GHC==9.0.2
GHC==8.10.7
GHC==8.8.4
GHC==8.6.5
GHC==8.4.4
GHC==8.2.2
GHC==8.0.2
GHC==7.10.3

source-repository head
type: git
Expand Down
27 changes: 13 additions & 14 deletions microlens-ghc/microlens-ghc.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,19 @@ build-type: Simple
extra-source-files:
CHANGELOG.md
cabal-version: >=1.10
tested-with: GHC==7.6.3
GHC==7.8.4
GHC==7.10.3
GHC==8.0.2
GHC==8.2.2
GHC==8.4.4
GHC==8.6.5
GHC==8.8.4
GHC==8.10.7
GHC==9.0.2
tested-with:
GHC==9.8.1
GHC==9.6.3
GHC==9.4.7
GHC==9.2.8
GHC==9.4.6
GHC==9.6.2
GHC==9.8.0
GHC==9.0.2
GHC==8.10.7
GHC==8.8.4
GHC==8.6.5
GHC==8.4.4
GHC==8.2.2
GHC==8.0.2
GHC==7.10.3

source-repository head
type: git
Expand All @@ -44,7 +43,7 @@ library
-- other-extensions:
build-depends: array >=0.3.0.2 && <0.6
, base >=4.5 && <5
, bytestring >=0.9.2.1 && <0.12
, bytestring >=0.9.2.1 && <0.13
, containers >=0.4.0 && <0.7
, microlens ==0.4.13.*
, transformers >=0.2 && <0.7
Expand Down
25 changes: 12 additions & 13 deletions microlens-mtl/microlens-mtl.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,19 @@ build-type: Simple
extra-source-files:
CHANGELOG.md
cabal-version: >=1.10
tested-with: GHC==7.6.3
GHC==7.8.4
GHC==7.10.3
GHC==8.0.2
GHC==8.2.2
GHC==8.4.4
GHC==8.6.5
GHC==8.8.4
GHC==8.10.7
GHC==9.0.2
tested-with:
GHC==9.8.1
GHC==9.6.3
GHC==9.4.7
GHC==9.2.8
GHC==9.4.6
GHC==9.6.2
GHC==9.8.0
GHC==9.0.2
GHC==8.10.7
GHC==8.8.4
GHC==8.6.5
GHC==8.4.4
GHC==8.2.2
GHC==8.0.2
GHC==7.10.3

source-repository head
type: git
Expand Down
27 changes: 13 additions & 14 deletions microlens-platform/microlens-platform.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,19 @@ build-type: Simple
extra-source-files:
CHANGELOG.md
cabal-version: >=1.10
tested-with: GHC==7.6.3
GHC==7.8.4
GHC==7.10.3
GHC==8.0.2
GHC==8.2.2
GHC==8.4.4
GHC==8.6.5
GHC==8.8.4
GHC==8.10.7
GHC==9.0.2
tested-with:
GHC==9.8.1
GHC==9.6.3
GHC==9.4.7
GHC==9.2.8
GHC==9.4.6
GHC==9.6.2
GHC==9.8.0
GHC==9.0.2
GHC==8.10.7
GHC==8.8.4
GHC==8.6.5
GHC==8.4.4
GHC==8.2.2
GHC==8.0.2
GHC==7.10.3

source-repository head
type: git
Expand All @@ -48,7 +47,7 @@ library
, microlens-ghc ==0.4.14.*
, microlens-mtl ==0.2.0.*
, microlens-th ==0.4.3.*
, text >=0.11 && <1.3 || >=2.0 && <2.1
, text >=0.11 && <1.3 || >=2.0 && <2.2
, unordered-containers >=0.2.4 && <0.3
, vector >=0.9 && <0.14

Expand Down
25 changes: 12 additions & 13 deletions microlens-th/microlens-th.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,19 @@ build-type: Simple
extra-source-files:
CHANGELOG.md
cabal-version: >=1.10
tested-with: GHC==7.6.3
GHC==7.8.4
GHC==7.10.3
GHC==8.0.2
GHC==8.2.2
GHC==8.4.4
GHC==8.6.5
GHC==8.8.4
GHC==8.10.7
GHC==9.0.2
tested-with:
GHC==9.8.1
GHC==9.6.3
GHC==9.4.7
GHC==9.2.8
GHC==9.4.6
GHC==9.6.2
GHC==9.8.0
GHC==9.0.2
GHC==8.10.7
GHC==8.8.4
GHC==8.6.5
GHC==8.4.4
GHC==8.2.2
GHC==8.0.2
GHC==7.10.3

source-repository head
type: git
Expand Down
25 changes: 12 additions & 13 deletions microlens/microlens.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,20 +41,19 @@ build-type: Simple
extra-source-files:
CHANGELOG.md
cabal-version: >=1.10
tested-with: GHC==7.6.3
GHC==7.8.4
GHC==7.10.3
GHC==8.0.2
GHC==8.2.2
GHC==8.4.4
GHC==8.6.5
GHC==8.8.4
GHC==8.10.7
GHC==9.0.2
tested-with:
GHC==9.8.1
GHC==9.6.3
GHC==9.4.7
GHC==9.2.8
GHC==9.4.6
GHC==9.6.2
GHC==9.8.0
GHC==9.0.2
GHC==8.10.7
GHC==8.8.4
GHC==8.6.5
GHC==8.4.4
GHC==8.2.2
GHC==8.0.2
GHC==7.10.3

source-repository head
type: git
Expand Down

0 comments on commit b1182e6

Please sign in to comment.