Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependency for bytestring-0.11, add 9.2 CI #60

Merged
merged 5 commits into from
Mar 21, 2022
Merged

Update dependency for bytestring-0.11, add 9.2 CI #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0265da1
Update dependency for bytestring-0.11, add 9.2 CI
maksbotan Mar 21, 2022
867b184
Enable Ubuntu universe repo in ghcjs CI
maksbotan Mar 21, 2022
774ca53
Run ghcjs CI on ubuntu 20.04
maksbotan Mar 21, 2022
3c23158
Remove network-2.8 constraint set
maksbotan Mar 21, 2022
b840a39
Disable servant-0.18 build for 9.2
maksbotan Mar 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .github/workflows/ghcjs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ on:

jobs:
ghcjs:
name: ubuntu-18.04 / ghcjs 8.4
runs-on: "ubuntu-18.04"
name: ubuntu-20.04 / ghcjs 8.4
runs-on: "ubuntu-20.04"

steps:
- uses: actions/checkout@v2
Expand All @@ -20,6 +20,10 @@ jobs:

- name: Install ghcjs and cabal
run: |
sudo apt-get update -y
sudo apt-get install -y --no-install-recommends software-properties-common
# Needed to get nodejs and npm
sudo add-apt-repository -y universe
# Default GitHub image dropped ppa:hvr/ghc, so we add it ourselves
sudo add-apt-repository ppa:hvr/ghc
sudo add-apt-repository ppa:hvr/ghcjs
Expand Down
25 changes: 11 additions & 14 deletions .github/workflows/haskell-ci.yml
View file
Open in desktop
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.14
# version: 0.14.3
#
# REGENDATA ("0.14",["github","cabal.project","--allow-failures",">= 9.2","--distribution","focal"])
# REGENDATA ("0.14.3",["github","cabal.project","--allow-failures",">= 9.2","--distribution","focal"])
#
name: Haskell-CI
on:
Expand All @@ -32,6 +32,11 @@ jobs:
strategy:
matrix:
include:
- compiler: ghc-9.2.2
compilerKind: ghc
compilerVersion: 9.2.2
setup-method: ghcup
allow-failure: true
- compiler: ghc-9.0.2
compilerKind: ghc
compilerVersion: 9.0.2
Expand Down Expand Up @@ -60,7 +65,7 @@ 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.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
chmod a+x "$HOME/.ghcup/bin/ghcup"
"$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
Expand All @@ -69,7 +74,7 @@ jobs:
apt-get update
apt-get install -y "$HCNAME"
mkdir -p "$HOME/.ghcup/bin"
curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"
curl -sL https://downloads.haskell.org/ghcup/0.1.17.5/x86_64-linux-ghcup-0.1.17.5 > "$HOME/.ghcup/bin/ghcup"
chmod a+x "$HOME/.ghcup/bin/ghcup"
"$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0
fi
Expand Down Expand Up @@ -244,17 +249,9 @@ jobs:
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.19.*' all
- name: constraint set servant-0.18
run: |
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' --dependencies-only -j2 all
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' all
if [ $((HCNUMVER < 90200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' --dependencies-only -j2 all ; fi
if [ $((HCNUMVER < 90200)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.18.*' all ; fi
- name: constraint set servant-0.17
run: |
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.17.*' --dependencies-only -j2 all ; fi
if [ $((HCNUMVER < 81000)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='servant ==0.17.*' all ; fi
- name: constraint set network-3.0
run: |
if [ $((HCNUMVER < 80800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='network == 3.0.*' --dependencies-only -j2 all ; fi
if [ $((HCNUMVER < 80800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='network == 3.0.*' all ; fi
- name: constraint set network-2.8
run: |
if [ $((HCNUMVER < 80800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='network == 2.8.*' --dependencies-only -j2 all ; fi
if [ $((HCNUMVER < 80800)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks --constraint='network == 2.8.*' all ; fi
10 changes: 1 addition & 9 deletions cabal.haskell-ci
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
branches: master

constraint-set network-2.8
ghc: >= 8.0 && <8.8
constraints: network == 2.8.*

constraint-set network-3.0
ghc: >= 8.0 && <8.8
constraints: network == 3.0.*

constraint-set servant-0.17
ghc: >= 8.0 && <8.10
constraints: servant ==0.17.*

constraint-set servant-0.18
ghc: >= 8.0 && <9.4
ghc: >= 8.0 && <9.2
constraints: servant ==0.18.*

constraint-set servant-0.19
Expand Down
3 changes: 2 additions & 1 deletion servant-multipart-api/servant-multipart-api.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ tested-with:
|| ==8.8.4
|| ==8.10.7
|| ==9.0.2
|| ==9.2.2

library
default-language: Haskell2010
Expand All @@ -29,7 +30,7 @@ library
-- ghc boot libs
build-depends:
base >=4.9 && <5
, bytestring >=0.10.8.1 && <0.11
, bytestring >=0.10.8.1 && <0.12
, text >=1.2.3.0 && <2.1
, transformers >=0.5.2.0 && <0.6

Expand Down
3 changes: 2 additions & 1 deletion servant-multipart-client/servant-multipart-client.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ tested-with:
|| ==8.8.4
|| ==8.10.7
|| ==9.0.2
|| ==9.2.2

library
default-language: Haskell2010
Expand All @@ -29,7 +30,7 @@ library
build-depends:
array >=0.5.1.1 && <0.6
, base >=4.9 && <5
, bytestring >=0.10.8.1 && <0.11
, bytestring >=0.10.8.1 && <0.12
, text >=1.2.3.0 && <2.1
, random >=0.1.1 && <1.3

Expand Down
3 changes: 2 additions & 1 deletion servant-multipart/servant-multipart.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ tested-with:
|| ==8.8.4
|| ==8.10.7
|| ==9.0.2
|| ==9.2.2

library
default-language: Haskell2010
Expand All @@ -28,7 +29,7 @@ library
-- ghc boot libs
build-depends:
base >=4.9 && <5
, bytestring >=0.10.8.1 && <0.11
, bytestring >=0.10.8.1 && <0.12
, directory >=1.3 && <1.4
, text >=1.2.3.0 && <2.1

Expand Down