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

Jump to bottom

Build against sbv-10.2 #1550

Merged
merged 5 commits into from
Jul 13, 2023
Merged

Build against sbv-10.2 #1550

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9ea9005
Allow building with sbv-10.2
RyanGlScott Jul 12, 2023
71a8f86
CI: Use GHC 9.2.8, 9.4.5
RyanGlScott Jul 12, 2023
77a52e3
CI: Prefer Use 9.2.8 (not 8.10.7) for building Docker images
RyanGlScott Jul 12, 2023
f2bf0ec
CI: Set UTF-8 in cryptol-remote-api's portable build
RyanGlScott Jul 13, 2023
a045188
README: Fix typo
RyanGlScott Jul 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,22 +65,22 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-22.04, macos-12, windows-2019]
ghc-version: ["8.10.7", "9.2.4", "9.4.4"]
ghc-version: ["8.10.7", "9.2.8", "9.4.5"]
cabal: [ '3.8.1.0' ]
run-tests: [true]
exclude:
- os: windows-2019
ghc-version: 9.2.4
ghc-version: 8.10.7
run-tests: true
- os: windows-2019
ghc-version: 9.4.4
ghc-version: 9.4.5
run-tests: true
include:
# We include one job from an older Ubuntu LTS release to increase our
# coverage of possible Linux configurations. Since we already run the
# tests with the newest LTS release, we won't bother testing this one.
- os: ubuntu-20.04
ghc-version: 8.10.7
ghc-version: 9.2.8
run-tests: false
outputs:
test-lib-json: ${{ steps.test-lib.outputs.targets-json }}
Expand Down Expand Up @@ -218,13 +218,13 @@ jobs:
if-no-files-found: error
retention-days: ${{ needs.config.outputs.retention-days }}

- if: matrix.ghc-version == '8.10.7' && matrix.run-tests
- if: matrix.ghc-version == '9.2.8' && matrix.run-tests
uses: actions/upload-artifact@v2
with:
path: dist/bin
name: ${{ runner.os }}-dist-bin

- if: matrix.ghc-version == '8.10.7' && matrix.run-tests
- if: matrix.ghc-version == '9.2.8' && matrix.run-tests
uses: actions/upload-artifact@v2
with:
path: bin
Expand Down Expand Up @@ -268,7 +268,7 @@ jobs:

- uses: haskell/actions/setup@v2
with:
ghc-version: '8.10.7'
ghc-version: '9.2.8'

- name: Install dependencies (Windows)
uses: msys2/setup-msys2@v2
Expand Down
4 changes: 2 additions & 2 deletions .gitpod.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yq \
RUN curl https://i.jpillora.com/chisel! | bash

# Install GHC
ARG GHCVER="8.10.7"
ARG GHCVER="9.2.8"
ENV GHCUP_INSTALL_BASE_PREFIX=/opt \
PATH=/opt/.ghcup/bin:$PATH
RUN curl -o /usr/local/bin/ghcup "https://downloads.haskell.org/~ghcup/0.1.17.7/x86_64-linux-ghcup-0.1.17.7" && \
RUN curl -o /usr/local/bin/ghcup "https://downloads.haskell.org/~ghcup/0.1.19.4/x86_64-linux-ghcup-0.1.19.4" && \
chmod +x /usr/local/bin/ghcup
RUN ghcup install cabal --set
ENV PATH=/root/.cabal/bin:$PATH
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ RUN z3 --version
ARG CRYPTOLPATH="/cryptol/.cryptol"
ENV LANG=C.UTF-8 \
LC_ALL=C.UTF-8
COPY cabal.GHC-8.10.7.config cabal.project.freeze
COPY cabal.GHC-9.2.8.config cabal.project.freeze
RUN mkdir -p /home/cryptol/.local/bin && \
curl -L https://downloads.haskell.org/~ghcup/0.1.17.7/x86_64-linux-ghcup-0.1.17.7 -o /home/cryptol/.local/bin/ghcup && \
curl -L https://downloads.haskell.org/~ghcup/0.1.19.4/x86_64-linux-ghcup-0.1.19.4 -o /home/cryptol/.local/bin/ghcup && \
chmod +x /home/cryptol/.local/bin/ghcup
RUN mkdir -p /home/cryptol/.ghcup && \
ghcup --version && \
ghcup install cabal 3.6.2.0 && \
ghcup install ghc 8.10.7 && \
ghcup set ghc 8.10.7
ghcup install ghc 9.2.8 && \
ghcup set ghc 9.2.8
RUN cabal v2-update && \
cabal v2-build -j cryptol:exe:cryptol && \
cp $(cabal v2-exec which cryptol) rootfs/usr/local/bin && \
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ Windows. We regularly build and test it in the following environments:
## Prerequisites

Cryptol is regularly built and tested with the three most recent
versions of GHC, which at the time of this writing are 8.10.7, 9.2.2, and
9.4.4. The easiest way to install an approporiate version of GHC is
versions of GHC, which at the time of this writing are 8.10.7, 9.2.8, and
9.4.5. The easiest way to install an approporiate version of GHC is
RyanGlScott marked this conversation as resolved.
Show resolved Hide resolved
with [ghcup](https://www.haskell.org/ghcup/).

Some supporting non-Haskell libraries are required to build
Expand Down
124 changes: 64 additions & 60 deletions cabal.GHC-8.10.7.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,26 @@ constraints: any.BoundedChan ==1.0.3.0,
MemoTrie -examples,
any.OneTuple ==0.3.1,
any.Only ==0.1,
any.QuickCheck ==2.14.2,
any.QuickCheck ==2.14.3,
QuickCheck -old-random +templatehaskell,
any.StateVar ==1.2.2,
any.adjunctions ==4.4.2,
any.aeson ==2.1.1.0,
any.aeson ==2.1.2.1,
aeson -cffi +ordered-keymap,
any.alex ==3.2.7.1,
any.ansi-terminal ==0.11.4,
any.alex ==3.4.0.0,
any.ansi-terminal ==1.0,
ansi-terminal -example,
any.ansi-terminal-types ==0.11.5,
any.ansi-wl-pprint ==0.6.9,
ansi-wl-pprint -example,
any.appar ==0.1.8,
any.arithmoi ==0.12.0.2,
any.arithmoi ==0.12.1.0,
any.array ==0.5.4.0,
any.asn1-encoding ==0.9.6,
any.asn1-parse ==0.9.5,
any.asn1-types ==0.3.4,
any.assoc ==1.0.2,
any.assoc ==1.1,
assoc +tagged,
any.async ==2.2.4,
async -bench,
any.attoparsec ==0.14.4,
Expand All @@ -35,15 +37,15 @@ constraints: any.BoundedChan ==1.0.3.0,
any.base ==4.14.3.0,
any.base-compat ==0.12.2,
any.base-compat-batteries ==0.12.2,
any.base-orphans ==0.8.7,
any.base-orphans ==0.8.8.2,
any.base64-bytestring ==1.2.1.0,
any.basement ==0.0.15,
any.bifunctors ==5.5.14,
bifunctors +semigroups +tagged,
any.basement ==0.0.16,
any.bifunctors ==5.6.1,
bifunctors +tagged,
any.bimap ==0.5.0,
any.binary ==0.8.8.0,
any.binary-orphans ==1.0.3,
any.bitvec ==1.1.3.0,
any.binary-orphans ==1.0.4.1,
any.bitvec ==1.1.4.0,
bitvec -libgmp,
any.bitwise ==1.0.0.1,
any.blaze-builder ==0.4.2.2,
Expand Down Expand Up @@ -75,42 +77,47 @@ constraints: any.BoundedChan ==1.0.3.0,
any.contravariant ==1.5.5,
contravariant +semigroups +statevar +tagged,
any.cookie ==0.4.6,
any.criterion ==1.6.0.0,
any.criterion ==1.6.1.0,
criterion -embed-data-files -fast,
any.criterion-measurement ==0.2.0.0,
any.criterion-measurement ==0.2.1.0,
criterion-measurement -fast,
any.cryptohash-md5 ==0.11.101.0,
any.cryptohash-sha1 ==0.11.101.0,
cryptol +ffi +relocatable -static,
cryptol-remote-api -notthreaded -static,
cryptol-test-runner -static,
any.cryptonite ==0.30,
cryptonite -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq -support_pclmuldq +support_rdrand -support_sse +use_target_attributes,
any.crypton ==0.33,
crypton -check_alignment +integer-gmp -old_toolchain_inliner +support_aesni +support_deepseq +support_pclmuldq +support_rdrand -support_sse +use_target_attributes,
any.crypton-x509 ==1.7.6,
any.crypton-x509-store ==1.6.9,
any.crypton-x509-validation ==1.6.12,
any.data-array-byte ==0.1.0.1,
any.data-default-class ==0.1.2.0,
any.data-fix ==0.3.2,
any.deepseq ==1.4.4.0,
any.dense-linear-algebra ==0.1.0.0,
any.deriving-compat ==0.6.2,
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.distributive ==0.6.2.1,
distributive +semigroups +tagged,
any.dlist ==1.0,
dlist -werror,
any.easy-file ==0.2.2,
any.easy-file ==0.2.5,
any.entropy ==0.4.1.10,
entropy -donotgetentropy,
any.exact-pi ==0.5.0.2,
any.exceptions ==0.10.4,
any.extensible-exceptions ==0.1.1.4,
any.extra ==1.7.12,
any.fast-logger ==3.2.0,
any.filelock ==0.1.1.5,
any.extra ==1.7.14,
any.fast-logger ==3.2.2,
any.filelock ==0.1.1.6,
any.filepath ==1.4.2.1,
any.fingertree ==0.1.5.0,
any.free ==5.1.10,
any.generically ==0.1,
any.foldable1-classes-compat ==0.1,
foldable1-classes-compat +tagged,
any.free ==5.2,
any.generically ==0.1.1,
any.ghc-boot-th ==8.10.7,
any.ghc-prim ==0.6.1,
any.gitrev ==1.3.1,
Expand All @@ -120,24 +127,25 @@ constraints: any.BoundedChan ==1.0.3.0,
any.hashtables ==1.3.1,
hashtables -bounds-checking -debug -detailed-profiling -portable -sse42 +unsafe-tricks,
any.haskeline ==0.8.2,
any.haskell-lexer ==1.1.1,
any.heredoc ==0.2.0.0,
any.hgmp ==0.1.2.1,
any.hostname ==1.0,
any.hourglass ==0.2.12,
any.hsc2hs ==0.68.8,
any.hsc2hs ==0.68.9,
hsc2hs -in-ghc-tree,
any.http-date ==0.0.11,
any.http-types ==0.12.3,
any.http2 ==4.0.0,
http2 -devel -doc -h2spec,
any.http2 ==4.1.4,
http2 -devel -h2spec,
any.ieee754 ==0.8.0,
any.indexed-traversable ==0.1.2,
any.indexed-traversable-instances ==0.1.1.1,
any.indexed-traversable ==0.1.2.1,
any.indexed-traversable-instances ==0.1.1.2,
any.integer-gmp ==1.0.3.0,
any.integer-logarithms ==1.0.3.1,
integer-logarithms -check-bounds +integer-gmp,
any.integer-roots ==1.0.2.0,
any.invariant ==0.6,
any.invariant ==0.6.1,
any.io-streams ==1.5.2.2,
io-streams +network -nointeractivetests +zlib,
any.iproute ==1.7.12,
Expand All @@ -146,7 +154,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.language-c99 ==0.2.0,
any.language-c99-simple ==0.2.2,
any.language-c99-util ==0.2.0,
any.lens ==5.2,
any.lens ==5.2.2,
lens -benchmark-uniplate -dump-splices +inlining -j +test-hunit +test-properties +test-templates +trustworthy,
any.libBF ==0.6.5.1,
libBF -system-libbf,
Expand All @@ -165,7 +173,7 @@ constraints: any.BoundedChan ==1.0.3.0,
any.monadLib ==3.10.1,
any.mtl ==2.2.2,
any.mwc-random ==0.15.0.2,
any.network ==3.1.2.7,
any.network ==3.1.4.0,
network -devel,
any.network-byte-order ==0.1.6,
any.network-info ==0.2.1,
Expand All @@ -185,55 +193,55 @@ constraints: any.BoundedChan ==1.0.3.0,
parser-combinators -dev,
any.pem ==0.2.4,
any.pretty ==1.1.3.6,
any.pretty-show ==1.10,
any.prettyprinter ==1.7.1,
prettyprinter -buildreadme +text,
any.primitive ==0.7.4.0,
any.primitive ==0.8.0.0,
any.process ==1.6.13.2,
any.profunctors ==5.6.2,
any.psqueues ==0.2.7.3,
any.quickcheck-instances ==0.3.28,
any.quickcheck-instances ==0.3.29.1,
quickcheck-instances -bytestring-builder,
any.random ==1.2.1.1,
any.recv ==0.1.0,
any.reflection ==2.1.6,
any.reflection ==2.1.7,
reflection -slow +template-haskell,
any.regex-base ==0.94.0.2,
any.regex-compat ==0.95.2.1,
any.regex-posix ==0.96.0.1,
regex-posix -_regex-posix-clib,
any.resourcet ==1.3.0,
any.rts ==1.0.1,
any.s-cargot ==0.1.5.0,
any.s-cargot ==0.1.6.0,
s-cargot -build-example,
any.safe ==0.3.19,
any.safe-exceptions ==0.1.7.3,
any.safe-exceptions ==0.1.7.4,
any.sbv ==9.2,
any.scientific ==0.3.7.0,
scientific -bytestring-builder -integer-simple,
any.scotty ==0.12.1,
any.semialign ==1.2.0.1,
any.semialign ==1.3,
semialign +semigroupoids,
any.semigroupoids ==5.3.7,
any.semigroupoids ==6.0.0.1,
semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers,
any.semigroups ==0.20,
semigroups +binary +bytestring -bytestring-builder +containers +deepseq +hashable +tagged +template-haskell +text +transformers +unordered-containers,
any.semirings ==0.6,
semirings +containers +unordered-containers,
any.silently ==1.2.5.3,
any.simple-get-opt ==0.4,
any.simple-sendfile ==0.2.30,
simple-sendfile +allow-bsd,
any.simple-sendfile ==0.2.32,
simple-sendfile +allow-bsd -fallback,
any.simple-smt ==0.9.7,
any.splitmix ==0.1.0.4,
splitmix -optimised-mixer,
any.statistics ==0.16.1.2,
any.statistics ==0.16.2.0,
any.stm ==2.5.0.1,
any.streaming-commons ==0.2.2.5,
any.streaming-commons ==0.2.2.6,
streaming-commons -use-bytestring-builder,
any.strict ==0.4.0.1,
strict +assoc,
any.syb ==0.7.2.2,
any.tagged ==0.8.6.1,
any.strict ==0.5,
any.syb ==0.7.2.3,
any.tagged ==0.8.7,
tagged +deepseq +transformers,
any.tasty ==1.4.3,
tasty +unix,
Expand All @@ -251,15 +259,14 @@ constraints: any.BoundedChan ==1.0.3.0,
text-short -asserts,
any.tf-random ==0.5,
any.th-abstraction ==0.4.5.0,
any.th-lift ==0.8.2,
any.th-lift ==0.8.3,
any.th-lift-instances ==0.1.20,
any.these ==1.1.1.1,
these +assoc,
any.these ==1.2,
any.time ==1.9.3,
any.time-compat ==1.9.6.1,
time-compat -old-locale,
any.time-manager ==0.0.0,
any.tls ==1.6.0,
any.tls ==1.7.0,
tls +compat -hans +network,
any.tls-session-manager ==0.0.4,
any.transformers ==0.5.6.2,
Expand All @@ -271,10 +278,10 @@ constraints: any.BoundedChan ==1.0.3.0,
any.unbounded-delays ==0.1.1.1,
any.uniplate ==1.6.13,
any.unix ==2.7.2.2,
any.unix-compat ==0.6,
any.unix-compat ==0.7,
unix-compat -old-time,
any.unix-time ==0.4.8,
any.unliftio ==0.2.23.0,
any.unix-time ==0.4.10,
any.unliftio ==0.2.25.0,
any.unliftio-core ==0.2.1.0,
any.unordered-containers ==0.2.19.1,
unordered-containers -debug,
Expand All @@ -290,26 +297,23 @@ constraints: any.BoundedChan ==1.0.3.0,
any.vector-binary-instances ==0.2.5.2,
any.vector-stream ==0.1.0.0,
any.vector-th-unbox ==0.2.2,
any.versions ==5.0.4,
any.versions ==5.0.5,
any.void ==0.7.3,
void -safe,
any.wai ==3.2.3,
any.wai-extra ==3.1.13.0,
wai-extra -build-example,
any.wai-logger ==2.4.0,
any.warp ==3.3.24,
any.warp ==3.3.28,
warp +allow-sendfilefd -network-bytestring -warp-debug +x509,
any.warp-tls ==3.3.5,
any.warp-tls ==3.4.0,
any.what4 ==1.4,
what4 -drealtestdisable -solvertests -stptestdisable,
any.witherable ==0.4.2,
any.word8 ==0.1.3,
any.x509 ==1.7.7,
any.x509-store ==1.6.9,
any.x509-validation ==1.6.12,
any.xml ==1.3.14,
any.zenc ==0.1.2,
any.zlib ==0.6.3.0,
zlib -bundled-c-zlib -non-blocking-ffi -pkg-config,
any.zlib-bindings ==0.1.1.5
index-state: hackage.haskell.org 2023-02-13T12:20:33Z
index-state: hackage.haskell.org 2023-07-10T01:00:51Z