Skip to content

Commit

Permalink
CI: Test GHC 9.4.4, drop 8.8.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@RyanGlScott
RyanGlScott committed May 26, 2023
1 parent 3fe4fc8 commit eaaec00
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 57 deletions.
13 changes: 1 addition & 12 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
matrix:
os: [ubuntu-22.04, macos-12, windows-latest]
cabal: ["3.10.1.0"]
ghc: ["8.8.4", "8.10.7", "9.2.7"]
ghc: ["8.10.7", "9.2.7", "9.4.4"]
run-tests: [true]
include:
# We include one job from an older Ubuntu LTS release to increase our
Expand All @@ -79,17 +79,6 @@ jobs:
ghc: "8.10.7"
cabal: "3.10.1.0"
run-tests: false
exclude:
# Exclude 8.8 on macOS 12 due to
# https://gitlab.haskell.org/ghc/ghc/-/issues/18446
- os: macos-12
ghc: "8.8.4"
cabal: "3.10.1.0"
run-tests: true
- os: windows-latest
ghc: "8.8.4"
cabal: "3.10.1.0"
run-tests: true
outputs:
cabal-test-suites-json: ${{ steps.cabal-test-suites.outputs.targets-json }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ To build SAWScript and related utilities from source:
* Ensure that you have the `cabal` and `ghc` executables in your
`PATH`. If you don't already have them, we recommend using `ghcup`
to install them: <https://www.haskell.org/ghcup/>. We recommend
Cabal 3.4 or newer, and GHC 8.8, 8.10, or 9.2.
Cabal 3.4 or newer, and GHC 8.10, 9.2, or 9.4.

* Ensure that you have the C libraries and header files for
`terminfo`, which generally comes as part of `ncurses` on most
Expand Down
68 changes: 34 additions & 34 deletions cabal.GHC-8.8.4.config → cabal.GHC-9.4.4.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
active-repositories: hackage.haskell.org:merge
constraints: any.BoundedChan ==1.0.3.0,
any.Cabal ==3.0.1.0,
any.Cabal ==3.8.1.0,
any.Cabal-syntax ==3.8.1.0,
any.Glob ==0.10.2,
any.GraphSCC ==1.0.4,
GraphSCC -use-maps,
Expand All @@ -10,7 +11,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.MemoTrie ==0.6.10,
MemoTrie -examples,
any.MonadRandom ==0.6,
any.OneTuple ==0.3.1,
any.OneTuple ==0.4.1.1,
any.Only ==0.1,
any.QuickCheck ==2.14.2,
QuickCheck -old-random +templatehaskell,
Expand Down Expand Up @@ -39,17 +40,17 @@ constraints: any.BoundedChan ==1.0.3.0,
attoparsec -developer,
any.auto-update ==0.1.6,
any.barbies ==2.0.4.0,
any.base ==4.13.0.0,
any.base ==4.17.0.0,
any.base-compat ==0.12.2,
any.base-compat-batteries ==0.12.2,
any.base-orphans ==0.8.8.2,
any.base16-bytestring ==1.0.2.0,
any.base64-bytestring ==1.2.1.0,
any.basement ==0.0.14,
any.basement ==0.0.15,
any.bifunctors ==5.6.1,
bifunctors +tagged,
any.bimap ==0.5.0,
any.binary ==0.8.7.0,
any.binary ==0.8.9.1,
any.binary-orphans ==1.0.4.1,
any.bitvec ==1.1.4.0,
bitvec -libgmp,
Expand All @@ -61,7 +62,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.bsb-http-chunked ==0.0.0.4,
any.bv-sized ==1.0.5,
any.byteorder ==1.0.4,
any.bytestring ==0.10.10.1,
any.bytestring ==0.11.3.1,
any.cabal-doctest ==1.0.9,
any.call-stack ==0.4.0,
any.case-insensitive ==1.2.1.0,
Expand All @@ -84,7 +85,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.config-schema ==1.3.0.0,
any.config-value ==0.8.3,
any.constraints ==0.13.4,
any.containers ==0.6.2.1,
any.containers ==0.6.6,
any.contravariant ==1.5.5,
contravariant +semigroups +statevar +tagged,
any.cookie ==0.4.6,
Expand All @@ -102,16 +103,15 @@ constraints: any.BoundedChan ==1.0.3.0,
any.cryptonite-conduit ==0.2.2,
any.data-accessor ==0.2.3.1,
data-accessor +category +monadfail +splitbase,
any.data-array-byte ==0.1.0.1,
any.data-default-class ==0.1.2.0,
any.data-fix ==0.3.2,
any.data-inttrie ==0.1.4,
any.data-ref ==0.1,
any.deepseq ==1.4.4.0,
any.deepseq ==1.4.8.0,
any.dense-linear-algebra ==0.1.0.0,
any.deriving-compat ==0.6.3,
deriving-compat +base-4-9 +new-functor-classes +template-haskell-2-11,
any.directory ==1.3.6.0,
any.directory ==1.3.7.1,
any.distributive ==0.6.2.1,
distributive +semigroups +tagged,
any.dlist ==1.0,
Expand All @@ -125,8 +125,7 @@ constraints: any.BoundedChan ==1.0.3.0,
entropy -donotgetentropy,
any.erf ==2.0.0.0,
any.exact-pi ==0.5.0.2,
any.exceptions ==0.10.7,
exceptions +transformers-0-4,
any.exceptions ==0.10.5,
any.executable-path ==0.0.3.1,
any.extensible-exceptions ==0.1.1.4,
any.extra ==1.7.13,
Expand All @@ -136,7 +135,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.fgl-visualize ==0.1.0.1,
any.filelock ==0.1.1.6,
any.filemanip ==0.3.6.3,
any.filepath ==1.4.2.1,
any.filepath ==1.4.2.2,
any.fingertree ==0.1.5.0,
any.foldable1-classes-compat ==0.1,
foldable1-classes-compat +tagged,
Expand All @@ -148,13 +147,14 @@ constraints: any.BoundedChan ==1.0.3.0,
any.generic-random ==1.5.0.1,
generic-random -enable-inspect,
any.generically ==0.1.1,
any.ghc ==8.8.4,
any.ghc-boot ==8.8.4,
any.ghc-boot-th ==8.8.4,
any.ghc-heap ==8.8.4,
any.ghc ==9.4.4,
any.ghc-bignum ==1.3,
any.ghc-boot ==9.4.4,
any.ghc-boot-th ==9.4.4,
any.ghc-heap ==9.4.4,
any.ghc-paths ==0.1.0.12,
any.ghc-prim ==0.5.3,
any.ghci ==8.8.4,
any.ghc-prim ==0.9.0,
any.ghci ==9.4.4,
any.githash ==0.1.6.3,
any.gitrev ==1.3.1,
any.graphviz ==2999.20.1.0,
Expand All @@ -164,7 +164,7 @@ constraints: any.BoundedChan ==1.0.3.0,
hashable +integer-gmp -random-initial-seed,
any.hashtables ==1.3.1,
hashtables -bounds-checking -debug -detailed-profiling -portable -sse42 +unsafe-tricks,
any.haskeline ==0.7.5.0,
any.haskeline ==0.8.2,
any.haskell-lexer ==1.1.1,
any.haskell-src-exts ==1.23.1,
any.haskell-src-meta ==0.8.12,
Expand All @@ -176,7 +176,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.hobbits ==1.4,
any.hostname ==1.0,
any.hourglass ==0.2.12,
any.hpc ==0.6.0.3,
any.hpc ==0.6.1.0,
any.hsc2hs ==0.68.9,
hsc2hs -in-ghc-tree,
any.hspec ==2.10.10,
Expand All @@ -191,7 +191,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.indexed-profunctors ==0.1.1,
any.indexed-traversable ==0.1.2.1,
any.indexed-traversable-instances ==0.1.1.2,
any.integer-gmp ==1.0.2.0,
any.integer-gmp ==1.1,
any.integer-logarithms ==1.0.3.1,
integer-logarithms -check-bounds +integer-gmp,
any.integer-roots ==1.0.2.0,
Expand Down Expand Up @@ -226,17 +226,17 @@ constraints: any.BoundedChan ==1.0.3.0,
any.lumberjack ==1.0.2.0,
any.math-functions ==0.3.4.2,
math-functions +system-erf +system-expm1,
any.megaparsec ==9.2.1,
any.megaparsec ==9.3.0,
megaparsec -dev,
any.memory ==0.18.0,
memory +support_bytestring +support_deepseq,
any.microlens ==0.4.13.1,
any.microlens-th ==0.4.3.12,
any.microstache ==1.0.2.3,
any.mmorph ==1.2.0,
any.mod ==0.1.2.2,
any.mod ==0.2.0.1,
mod +semirings +vector,
any.modern-uri ==0.3.4.4,
any.modern-uri ==0.3.6.0,
modern-uri -dev,
any.monad-control ==1.0.3.1,
any.monadLib ==3.10.1,
Expand All @@ -259,7 +259,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.panic ==0.4.0.1,
any.parallel ==3.2.2.0,
parameterized-utils +unsafe-operations,
any.parsec ==3.1.14.0,
any.parsec ==3.1.15.0,
any.parser-combinators ==1.3.0,
parser-combinators -dev,
any.pem ==0.2.4,
Expand All @@ -271,7 +271,7 @@ constraints: any.BoundedChan ==1.0.3.0,
prettyprinter -buildreadme +text,
any.prettyprinter-ansi-terminal ==1.1.3,
any.primitive ==0.8.0.0,
any.process ==1.6.9.0,
any.process ==1.6.16.0,
any.profunctors ==5.6.2,
any.psqueues ==0.2.7.3,
any.quickcheck-instances ==0.3.29.1,
Expand All @@ -287,7 +287,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.regex-posix ==0.96.0.1,
regex-posix -_regex-posix-clib,
any.resourcet ==1.3.0,
any.rts ==1.0,
any.rts ==1.0.2,
any.s-cargot ==0.1.6.0,
s-cargot -build-example,
any.safe ==0.3.19,
Expand Down Expand Up @@ -315,7 +315,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.splitmix ==0.1.0.4,
splitmix -optimised-mixer,
any.statistics ==0.16.2.0,
any.stm ==2.5.0.0,
any.stm ==2.5.1.0,
any.streaming-commons ==0.2.2.6,
streaming-commons -use-bytestring-builder,
any.strict ==0.5,
Expand All @@ -337,14 +337,14 @@ constraints: any.BoundedChan ==1.0.3.0,
any.tasty-quickcheck ==0.10.2,
any.tasty-smallcheck ==0.8.2,
any.tasty-sugar ==2.1.0.0,
any.template-haskell ==2.15.0.0,
any.template-haskell ==2.19.0.0,
any.temporary ==1.3,
any.terminal-size ==0.3.3,
any.terminfo ==0.4.1.4,
any.terminfo ==0.4.1.5,
any.test-framework ==0.8.2.0,
any.test-framework-hunit ==0.3.0.2,
test-framework-hunit -base3 +base4,
any.text ==1.2.4.0,
any.text ==2.0.1,
any.text-conversions ==0.3.1.1,
any.text-short ==0.1.5,
text-short -asserts,
Expand All @@ -357,7 +357,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.th-orphans ==0.13.14,
any.th-reify-many ==0.1.10,
any.these ==1.2,
any.time ==1.9.3,
any.time ==1.12.2,
any.time-compat ==1.9.6.1,
time-compat -old-locale,
any.time-manager ==0.0.0,
Expand All @@ -373,7 +373,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.typed-process ==0.2.11.0,
any.unbounded-delays ==0.1.1.1,
any.uniplate ==1.6.13,
any.unix ==2.7.2.2,
any.unix ==2.7.3,
any.unix-compat ==0.7,
unix-compat -old-time,
any.unix-time ==0.4.9,
Expand Down
10 changes: 5 additions & 5 deletions saw-remote-api/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ USER saw
WORKDIR /home/saw
ENV LANG=C.UTF-8 \
LC_ALL=C.UTF-8
COPY cabal.GHC-8.8.4.config cabal.project.freeze
COPY cabal.GHC-8.10.7.config cabal.project.freeze
ENV PATH=/home/saw/ghcup-download/bin:/home/saw/.ghcup/bin:$PATH
RUN mkdir -p /home/saw/ghcup-download/bin && \
curl -L https://downloads.haskell.org/~ghcup/0.1.17.7/x86_64-linux-ghcup-0.1.17.7 -o /home/saw/ghcup-download/bin/ghcup && \
curl -L https://downloads.haskell.org/~ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 -o /home/saw/ghcup-download/bin/ghcup && \
chmod +x /home/saw/ghcup-download/bin/ghcup
RUN mkdir -p /home/saw/.ghcup && \
ghcup --version && \
ghcup install cabal 3.6.2.0 && \
ghcup install ghc 8.8.4 && \
ghcup set ghc 8.8.4
ghcup install cabal 3.8.1.0 && \
ghcup install ghc 8.10.7 && \
ghcup set ghc 8.10.7
RUN cabal v2-update && cabal v2-build -j exe:saw-remote-api
RUN mkdir -p /home/saw/rootfs/usr/local/bin
RUN cp $(cabal v2-exec which saw-remote-api) /home/saw/rootfs/usr/local/bin/saw-remote-api
Expand Down
10 changes: 5 additions & 5 deletions saw/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ USER saw
WORKDIR /home/saw
ENV LANG=C.UTF-8 \
LC_ALL=C.UTF-8
COPY cabal.GHC-8.8.4.config cabal.project.freeze
COPY cabal.GHC-8.10.7.config cabal.project.freeze
ENV PATH=/home/saw/ghcup-download/bin:/home/saw/.ghcup/bin:$PATH
RUN mkdir -p /home/saw/ghcup-download/bin && \
curl -L https://downloads.haskell.org/~ghcup/0.1.17.7/x86_64-linux-ghcup-0.1.17.7 -o /home/saw/ghcup-download/bin/ghcup && \
curl -L https://downloads.haskell.org/~ghcup/0.1.19.2/x86_64-linux-ghcup-0.1.19.2 -o /home/saw/ghcup-download/bin/ghcup && \
chmod +x /home/saw/ghcup-download/bin/ghcup
RUN mkdir -p /home/saw/.ghcup && \
ghcup --version && \
ghcup install cabal 3.6.2.0 && \
ghcup install ghc 8.8.4 && \
ghcup set ghc 8.8.4
ghcup install cabal 3.8.1.0 && \
ghcup install ghc 8.10.7 && \
ghcup set ghc 8.10.7
RUN cabal v2-update
RUN cabal v2-build
RUN mkdir -p /home/saw/rootfs/usr/local/bin
Expand Down

0 comments on commit eaaec00

Please sign in to comment.