Skip to content

Commit

Permalink
Test/allow GHC 9.6, 9.8 (#72)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ysangkok
ysangkok authored Dec 27, 2023
1 parent 987ffab commit 9a922b6
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 27 deletions.
46 changes: 28 additions & 18 deletions .github/workflows/haskell-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
#
# For more information, see https://github.com/haskell-CI/haskell-ci
#
# version: 0.17.20230826
# version: 0.17.20231203
#
# REGENDATA ("0.17.20230826",["github","cabal.project","--allow-failures",">= 9.2","--distribution","focal"])
# REGENDATA ("0.17.20231203",["github","cabal.project","--allow-failures",">= 9.2","--distribution","focal"])
#
name: Haskell-CI
on:
Expand All @@ -32,9 +32,19 @@ jobs:
strategy:
matrix:
include:
- compiler: ghc-9.4.7
- compiler: ghc-9.8.1
compilerKind: ghc
compilerVersion: 9.4.7
compilerVersion: 9.8.1
setup-method: ghcup
allow-failure: true
- compiler: ghc-9.6.3
compilerKind: ghc
compilerVersion: 9.6.3
setup-method: ghcup
allow-failure: true
- compiler: ghc-9.4.8
compilerKind: ghc
compilerVersion: 9.4.8
setup-method: ghcup
allow-failure: true
- compiler: ghc-9.2.8
Expand Down Expand Up @@ -70,18 +80,18 @@ jobs:
apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
if [ "${{ matrix.setup-method }}" = ghcup ]; then
mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$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"
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
else
apt-add-repository -y 'ppa:hvr/ghc'
apt-get update
apt-get install -y "$HCNAME"
mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.19.5/x86_64-linux-ghcup-0.1.19.5 > "$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"
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.1.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
"$HOME/.ghcup/bin/ghcup" install cabal 3.10.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
fi
env:
HCKIND: ${{ matrix.compilerKind }}
Expand All @@ -101,13 +111,13 @@ jobs:
echo "HC=$HC" >> "$GITHUB_ENV"
echo "HCPKG=$HCPKG" >> "$GITHUB_ENV"
echo "HADDOCK=$HADDOCK" >> "$GITHUB_ENV"
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
else
HC=$HCDIR/bin/$HCKIND
echo "HC=$HC" >> "$GITHUB_ENV"
echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"
echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.1.0 -vnormal+nowrap" >> "$GITHUB_ENV"
echo "CABAL=$HOME/.ghcup/bin/cabal-3.10.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
fi
HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')
Expand Down Expand Up @@ -252,16 +262,16 @@ jobs:
rm -f cabal.project.local
- name: constraint set servant-0.20
run: |
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' all --dry-run
cabal-plan topo | sort
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' --dependencies-only -j2 all
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' all
if [ $((HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' all --dry-run ; fi
if [ $((HCNUMVER < 90800)) -ne 0 ] ; then cabal-plan topo | sort ; fi
if [ $((HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' --dependencies-only -j2 all ; fi
if [ $((HCNUMVER < 90800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.20.*' all ; fi
- name: constraint set servant-0.19
run: |
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' all --dry-run
cabal-plan topo | sort
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' --dependencies-only -j2 all
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' all
if [ $((HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' all --dry-run ; fi
if [ $((HCNUMVER < 90600)) -ne 0 ] ; then cabal-plan topo | sort ; fi
if [ $((HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' --dependencies-only -j2 all ; fi
if [ $((HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' all ; fi
- name: constraint set servant-0.18
run: |
if [ $((HCNUMVER < 90200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' all --dry-run ; fi
Expand Down
8 changes: 5 additions & 3 deletions servant-multipart-api/servant-multipart-api.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ tested-with:
|| ==8.10.7
|| ==9.0.2
|| ==9.2.8
|| ==9.4.7
|| ==9.4.8
|| ==9.6.3
|| ==9.8.1

library
default-language: Haskell2010
Expand All @@ -31,8 +33,8 @@ library
-- ghc boot libs
build-depends:
base >=4.9 && <5
, bytestring >=0.10.8.1 && <0.12
, text >=1.2.3.0 && <2.1
, bytestring >=0.10.8.1 && <0.13
, text >=1.2.3.0 && <2.2
, transformers >=0.5.2.0 && <0.7

-- other dependencies
Expand Down
8 changes: 5 additions & 3 deletions servant-multipart-client/servant-multipart-client.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ tested-with:
|| ==8.10.7
|| ==9.0.2
|| ==9.2.8
|| ==9.4.7
|| ==9.4.8
|| ==9.6.3
|| ==9.8.1

library
default-language: Haskell2010
Expand All @@ -31,8 +33,8 @@ library
build-depends:
array >=0.5.1.1 && <0.6
, base >=4.9 && <5
, bytestring >=0.10.8.1 && <0.12
, text >=1.2.3.0 && <2.1
, bytestring >=0.10.8.1 && <0.13
, text >=1.2.3.0 && <2.2
, random >=0.1.1 && <1.3

-- other dependencies
Expand Down
8 changes: 5 additions & 3 deletions servant-multipart/servant-multipart.cabal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ tested-with:
|| ==8.10.7
|| ==9.0.2
|| ==9.2.8
|| ==9.4.7
|| ==9.4.8
|| ==9.6.3
|| ==9.8.1

library
default-language: Haskell2010
Expand All @@ -30,9 +32,9 @@ library
-- ghc boot libs
build-depends:
base >=4.9 && <5
, bytestring >=0.10.8.1 && <0.12
, bytestring >=0.10.8.1 && <0.13
, directory >=1.3 && <1.4
, text >=1.2.3.0 && <2.1
, text >=1.2.3.0 && <2.2

-- other dependencies
build-depends:
Expand Down

0 comments on commit 9a922b6

Please sign in to comment.