GaloisInc/cryptol
1
1
Fork 0
mirror of https://github.com/GaloisInc/cryptol.git synced 2024-09-11 14:06:13 +03:00
Code Issues Projects Releases Wiki Activity

Prepare for v2.9.1 (#872)

Browse Source 
* Tiny tweaks to release notes
* Update GHC versions
* Update GHC versions for Actions
* Build releases with 8.8.4 (Something strange is going on with 8.10.2 on Windows)
This commit is contained in:
Aaron Tomb 2020-08-31 11:40:09 -07:00 committed by GitHub
parent 3a379bcbc0
commit 339c13b723
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/build.yml vendored
View File

@ -34,17 +34,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
ghc: ["8.6.5", "8.8.3", "8.10.1"]
exclude:
# The process-1.6.8 library contains a memory leak on windows,
# causing RAM constrained builds to sometimes fail.
# Technically, windows+GHC 8.10.1 should also likely be excluded, but
# we use GHC 8.10.1 for releases currently.
#
# https://gitlab.haskell.org/ghc/ghc/-/issues/17926
# TODO: remove when 8.8.4 and 8.10.2 are released
- os: windows-latest
ghc: 8.8.3
ghc: ["8.6.5", "8.8.4", "8.10.2"]
name: Cryptol - GHC v${{ matrix.ghc }} - ${{ matrix.os }}
env:
RELEASE: ${{ needs.outputs.outputs.release }}
@ -96,7 +86,7 @@ jobs:
run: .github/ci.sh test_dist
- if: >-
env.RELEASE && matrix.ghc == '8.10.1'
env.RELEASE && matrix.ghc == '8.8.4'
uses: actions/upload-artifact@v2
with:
path: dist/bin
@ -130,7 +120,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
ghc: ["8.10.1"]
ghc: ["8.8.4"]
needs: [outputs, docs, build]
env:
VERSION: ${{ needs.outputs.outputs.cryptol-version }}

6
CHANGES.md
View File

@ -1,4 +1,4 @@
# NEXT
# 2.9.1
## Language changes
@ -8,7 +8,9 @@
## Bug Fixes
* Closed issues #848, #850, #851, #859, #861
* Closed issues #848, #850, #851, #859, and #861.
* Fixed Windows installer paths.
# 2.9.0

4
Dockerfile
View File

@ -41,7 +41,7 @@ RUN curl -L https://cvc4.cs.stanford.edu/downloads/builds/x86_64-linux-opt/unst
# Set executable and run tests
RUN chmod +x rootfs/usr/local/bin/*
FROM haskell:8.8 AS build
FROM haskell:8.8.4 AS build
RUN apt-get update && apt-get install -y libncurses-dev
COPY --from=solvers /solvers/rootfs /
@ -53,7 +53,7 @@ ENV PATH=/cryptol/rootfs/usr/local/bin:$PATH
ARG CRYPTOLPATH="/cryptol/.cryptol"
ENV LANG=C.UTF-8 \
LC_ALL=C.UTF-8
COPY cabal.GHC-8.8.3.config cabal.project.freeze
COPY cabal.GHC-8.8.4.config cabal.project.freeze
RUN mkdir -p rootfs/usr/local/bin
RUN cabal v2-update && \
cabal v2-build -j cryptol:exe:cryptol && \

13
cabal.GHC-8.10.1.config → cabal.GHC-8.10.2.config
View File

@ -26,7 +26,7 @@ constraints: any.Cabal ==3.2.0.0,
async -bench,
any.attoparsec ==0.13.2.4,
attoparsec -developer,
any.base ==4.14.0.0,
any.base ==4.14.1.0,
any.base-compat ==0.11.1,
any.base-compat-batteries ==0.11.1,
any.base-orphans ==0.8.2,
@ -39,7 +39,7 @@ constraints: any.Cabal ==3.2.0.0,
any.blaze-builder ==0.4.1.0,
any.blaze-html ==0.9.1.2,
any.blaze-markup ==0.8.2.5,
any.bv-sized ==1.0.1,
any.bv-sized ==1.0.2,
any.bytestring ==0.10.10.0,
any.bytestring-builder ==0.10.8.2.0,
bytestring-builder +bytestring_has_builder,
@ -89,12 +89,7 @@ constraints: any.Cabal ==3.2.0.0,
any.free ==5.1.3,
any.generic-deriving ==1.13.1,
generic-deriving +base-4-9,
any.ghc ==8.10.1,
any.ghc-boot ==8.10.1,
any.ghc-boot-th ==8.10.1,
any.ghc-heap ==8.10.1,
any.ghc-prim ==0.6.1,
any.ghci ==8.10.1,
any.ghc-boot-th ==8.10.2,
any.gitrev ==1.3.1,
any.happy ==1.19.12,
happy +small_base,
@ -148,7 +143,7 @@ constraints: any.Cabal ==3.2.0.0,
any.pretty ==1.1.3.6,
any.pretty-show ==1.10,
any.primitive ==0.7.0.1,
any.process ==1.6.8.2,
any.process ==1.6.9.0,
any.profunctors ==5.5.2,
any.random ==1.1,
any.reflection ==2.1.6,

2
cabal.GHC-8.6.5.config
View File

@ -37,7 +37,7 @@ constraints: any.Cabal ==2.4.0.1,
any.blaze-builder ==0.4.1.0,
any.blaze-html ==0.9.1.2,
any.blaze-markup ==0.8.2.5,
any.bv-sized ==1.0.0,
any.bv-sized ==1.0.2,
any.bytestring ==0.10.8.2,
any.bytestring-builder ==0.10.8.2.0,
bytestring-builder +bytestring_has_builder,

12
cabal.GHC-8.8.3.config → cabal.GHC-8.8.4.config
View File

@ -37,8 +37,8 @@ constraints: any.Cabal ==3.0.1.0,
any.blaze-builder ==0.4.1.0,
any.blaze-html ==0.9.1.2,
any.blaze-markup ==0.8.2.5,
any.bv-sized ==1.0.0,
any.bytestring ==0.10.10.0,
any.bv-sized ==1.0.2,
any.bytestring ==0.10.10.1,
any.bytestring-builder ==0.10.8.2.0,
bytestring-builder +bytestring_has_builder,
any.cabal-doctest ==1.0.8,
@ -88,12 +88,8 @@ constraints: any.Cabal ==3.0.1.0,
any.free ==5.1.3,
any.generic-deriving ==1.13.1,
generic-deriving +base-4-9,
any.ghc ==8.8.3,
any.ghc-boot ==8.8.3,
any.ghc-boot-th ==8.8.3,
any.ghc-heap ==8.8.3,
any.ghc-boot-th ==8.8.4,
any.ghc-prim ==0.5.3,
any.ghci ==8.8.3,
any.gitrev ==1.3.1,
any.happy ==1.19.12,
happy +small_base,
@ -147,7 +143,7 @@ constraints: any.Cabal ==3.0.1.0,
any.pretty ==1.1.3.6,
any.pretty-show ==1.10,
any.primitive ==0.7.0.1,
any.process ==1.6.8.0,
any.process ==1.6.9.0,
any.profunctors ==5.5.2,
any.random ==1.1,
any.reflection ==2.1.5,