diff --git a/.github/ci.sh b/.github/ci.sh index 9d657c66..bc6c182b 100755 --- a/.github/ci.sh +++ b/.github/ci.sh @@ -135,6 +135,7 @@ bundle_files() { doc=dist/share/doc/cryptol mkdir -p $doc cp -R examples/ $doc/examples/ + rm -rf $doc/examples/cryptol-specs cp docs/*md docs/*pdf $doc # Copy the two interesting examples over diff --git a/CHANGES.md b/CHANGES.md index 21fe760e..ff3d4002 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,4 @@ -# NEXT +# 2.9.0 ## Language changes diff --git a/Dockerfile b/Dockerfile index 7217225d..b1556c9d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -43,8 +43,7 @@ FROM haskell:8.8 AS build RUN apt-get update && apt-get install -y libncurses-dev COPY --from=solvers /solvers/rootfs / -RUN useradd -m cryptol \ - && su -c '/opt/cabal/bin/cabal v2-update' cryptol +RUN useradd -m cryptol COPY --chown=cryptol:cryptol . /cryptol USER cryptol WORKDIR /cryptol @@ -54,6 +53,7 @@ ENV LANG=C.UTF-8 \ LC_ALL=C.UTF-8 COPY cabal.GHC-8.8.3.config cabal.project.freeze RUN mkdir -p rootfs/usr/local/bin +RUN cabal v2-update RUN cabal v2-install --install-method=copy --installdir=rootfs/usr/local/bin exe:cryptol RUN cabal v2-install --install-method=copy --installdir=bin test-lib RUN ./bin/test-runner --ext=.icry --exe=./rootfs/usr/local/bin/cryptol -F -b tests diff --git a/cryptol.cabal b/cryptol.cabal index 9260a0d1..67407c32 100644 --- a/cryptol.cabal +++ b/cryptol.cabal @@ -8,7 +8,7 @@ Author: Galois, Inc. Maintainer: cryptol@galois.com Homepage: http://www.cryptol.net/ Bug-reports: https://github.com/GaloisInc/cryptol/issues -Copyright: 2013-2019 Galois Inc. +Copyright: 2013-2020 Galois Inc. Category: Language Build-type: Simple Cabal-version: 1.18 diff --git a/docs/Cryptol.pdf b/docs/Cryptol.pdf deleted file mode 100644 index 81bf9103..00000000 Binary files a/docs/Cryptol.pdf and /dev/null differ diff --git a/docs/ProgrammingCryptol.pdf b/docs/ProgrammingCryptol.pdf index 81bf9103..4179fb2d 100644 Binary files a/docs/ProgrammingCryptol.pdf and b/docs/ProgrammingCryptol.pdf differ diff --git a/docs/ProgrammingCryptol/preface/Notice.tex b/docs/ProgrammingCryptol/preface/Notice.tex index f2353307..7f69f95b 100644 --- a/docs/ProgrammingCryptol/preface/Notice.tex +++ b/docs/ProgrammingCryptol/preface/Notice.tex @@ -8,7 +8,7 @@ appear in this documentation. Of course, we appreciate bug reports and clarification suggestions. - Copyright 2003--2018 Galois, Inc. All rights reserved by Galois, + Copyright 2003--2020 Galois, Inc. All rights reserved by Galois, Inc. The software installed in accordance with this documentation is