Tweak a few things for 2.9.0 (#833)

* Fix Dockerfile

* Include version number in CHANGES.md

* Update copyright dates

* Don't include cryptol-specs in release archives

* Remove duplicate copy of Programming Cryptol
This commit is contained in:
Aaron Tomb 2020-07-28 08:41:27 -07:00 committed by GitHub
parent 755d4d2de3
commit 5100132e4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 6 additions and 5 deletions

1
.github/ci.sh vendored
View File

@ -135,6 +135,7 @@ bundle_files() {
doc=dist/share/doc/cryptol doc=dist/share/doc/cryptol
mkdir -p $doc mkdir -p $doc
cp -R examples/ $doc/examples/ cp -R examples/ $doc/examples/
rm -rf $doc/examples/cryptol-specs
cp docs/*md docs/*pdf $doc cp docs/*md docs/*pdf $doc
# Copy the two interesting examples over # Copy the two interesting examples over

View File

@ -1,4 +1,4 @@
# NEXT # 2.9.0
## Language changes ## Language changes

View File

@ -43,8 +43,7 @@ FROM haskell:8.8 AS build
RUN apt-get update && apt-get install -y libncurses-dev RUN apt-get update && apt-get install -y libncurses-dev
COPY --from=solvers /solvers/rootfs / COPY --from=solvers /solvers/rootfs /
RUN useradd -m cryptol \ RUN useradd -m cryptol
&& su -c '/opt/cabal/bin/cabal v2-update' cryptol
COPY --chown=cryptol:cryptol . /cryptol COPY --chown=cryptol:cryptol . /cryptol
USER cryptol USER cryptol
WORKDIR /cryptol WORKDIR /cryptol
@ -54,6 +53,7 @@ ENV LANG=C.UTF-8 \
LC_ALL=C.UTF-8 LC_ALL=C.UTF-8
COPY cabal.GHC-8.8.3.config cabal.project.freeze COPY cabal.GHC-8.8.3.config cabal.project.freeze
RUN mkdir -p rootfs/usr/local/bin 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=rootfs/usr/local/bin exe:cryptol
RUN cabal v2-install --install-method=copy --installdir=bin test-lib 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 RUN ./bin/test-runner --ext=.icry --exe=./rootfs/usr/local/bin/cryptol -F -b tests

View File

@ -8,7 +8,7 @@ Author: Galois, Inc.
Maintainer: cryptol@galois.com Maintainer: cryptol@galois.com
Homepage: http://www.cryptol.net/ Homepage: http://www.cryptol.net/
Bug-reports: https://github.com/GaloisInc/cryptol/issues Bug-reports: https://github.com/GaloisInc/cryptol/issues
Copyright: 2013-2019 Galois Inc. Copyright: 2013-2020 Galois Inc.
Category: Language Category: Language
Build-type: Simple Build-type: Simple
Cabal-version: 1.18 Cabal-version: 1.18

Binary file not shown.

Binary file not shown.

View File

@ -8,7 +8,7 @@
appear in this documentation. Of course, we appreciate bug reports appear in this documentation. Of course, we appreciate bug reports
and clarification suggestions. and clarification suggestions.
Copyright 2003--2018 Galois, Inc. All rights reserved by Galois, Copyright 2003--2020 Galois, Inc. All rights reserved by Galois,
Inc. Inc.
The software installed in accordance with this documentation is The software installed in accordance with this documentation is