Merge pull request #1350 from GaloisInc/at-release-2.13-prep

Prepare for 2.13.0 release
GaloisInc · May 16, 2022 · 8cca245 · 8cca245
2 parents 5a2beda + 0bb42af
commit 8cca245
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 23 deletions.
diff --git a/.github/ci.sh b/.github/ci.sh
@@ -117,14 +117,14 @@ sign() {
 
 zip_dist() {
   : "${VERSION?VERSION is required as an environment variable}"
-  name="${name:-"cryptol-$VERSION-$RUNNER_OS-x86_64"}"
+  name="${name:-"cryptol-$VERSION-$OS_TAG-x86_64"}"
   cp -r dist "$name"
   tar -cvzf "$name".tar.gz "$name"
 }
 
 zip_dist_with_solvers() {
   : "${VERSION?VERSION is required as an environment variable}"
-  name="${name:-"cryptol-$VERSION-$RUNNER_OS-x86_64"}"
+  name="${name:-"cryptol-$VERSION-$OS_TAG-x86_64"}"
   sname="${name}-with-solvers"
   cp "$(which abc)"        dist/bin/
   cp "$(which cvc4)"       dist/bin/

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ env:
 
 jobs:
   config:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     outputs:
       name: ${{ steps.config.outputs.name }}
       version: ${{ steps.config.outputs.version }}
@@ -58,16 +58,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-20.04, macos-10.15, windows-2019]
         ghc-version: ["8.8.4", "8.10.7", "9.0.2", "9.2.2"]
         exclude:
           # https://gitlab.haskell.org/ghc/ghc/-/issues/18550
-          - os: windows-latest
+          - os: windows-2019
             ghc-version: 8.10.7
-          - os: windows-latest
+          - os: windows-2019
             ghc-version: 9.0.2
-          - os: windows-latest
+          - os: windows-2019
             ghc-version: 9.2.2
+        include:
+          # We include one job from an older Ubuntu LTS release to increase our
+          # coverage of possible Linux configurations.
+          - os: ubuntu-18.04
+            ghc-version: 8.8.4
     outputs:
       test-lib-json: ${{ steps.test-lib.outputs.targets-json }}
     env:
@@ -97,9 +102,9 @@ jobs:
           path: |
             ${{ steps.setup-haskell.outputs.cabal-store }}
             dist-newstyle
-          key: ${{ env.CACHE_VERSION }}-cabal-${{ runner.os }}-${{ matrix.ghc-version }}-${{ hashFiles(format('cabal.GHC-{0}.config', matrix.ghc-version)) }}-${{ github.sha }}
+          key: ${{ env.CACHE_VERSION }}-cabal-${{ matrix.os }}-${{ matrix.ghc-version }}-${{ hashFiles(format('cabal.GHC-{0}.config', matrix.ghc-version)) }}-${{ github.sha }}
           restore-keys: |
-            ${{ env.CACHE_VERSION }}-cabal-${{ runner.os }}-${{ matrix.ghc-version }}-${{ hashFiles(format('cabal.GHC-{0}.config', matrix.ghc-version)) }}-
+            ${{ env.CACHE_VERSION }}-cabal-${{ matrix.os }}-${{ matrix.ghc-version }}-${{ hashFiles(format('cabal.GHC-{0}.config', matrix.ghc-version)) }}-
 
       - shell: bash
         run: .github/ci.sh install_system_deps
@@ -162,15 +167,19 @@ jobs:
 
       - shell: bash
         run: |
-          NAME="${{ needs.config.outputs.name }}-${{ runner.os }}-x86_64"
+          NAME="${{ needs.config.outputs.name }}-${{ matrix.os }}-x86_64"
           echo "NAME=$NAME" >> $GITHUB_ENV
           .github/ci.sh zip_dist $NAME
+        env:
+          OS_TAG: ${{ matrix.os }}
 
       - shell: bash
         run: |
-          NAME="${{ needs.config.outputs.name }}-${{ runner.os }}-x86_64"
+          NAME="${{ needs.config.outputs.name }}-${{ matrix.os }}-x86_64"
           echo "NAME=$NAME" >> $GITHUB_ENV
           .github/ci.sh zip_dist_with_solvers $NAME
+        env:
+          OS_TAG: ${{ matrix.os }}
 
       - if: needs.config.outputs.release == 'true'
         shell: bash
@@ -223,20 +232,20 @@ jobs:
       matrix:
         suite: [test-lib]
         target: ${{ fromJson(needs.build.outputs.test-lib-json) }}
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-20.04, macos-10.15, windows-2019]
         continue-on-error: [false]
         include:
           - suite: rpc
             target: ''
-            os: ubuntu-latest
+            os: ubuntu-20.04
             continue-on-error: false
           #- suite: rpc
           #  target: ''
-          #  os: macos-latest
+          #  os: macos-10.05
           #  continue-on-error: false
           #- suite: rpc
           #  target: ''
-          #  os: windows-latest
+          #  os: windows-2019
           #  continue-on-error: true  # TODO: get Python client to work on Windows
     steps:
       - uses: actions/checkout@v2
@@ -301,7 +310,7 @@ jobs:
           cryptol-remote-api/run_rpc_tests.sh
 
   build-push-image:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: [config]
     if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
     strategy:

diff --git a/CHANGES.md b/CHANGES.md
@@ -1,12 +1,12 @@
-# NEXT
+# 2.13.0
 
 ## Language changes
 
 * Update the implementation of the Prelude function `sortBy` to use
   a merge sort instead of an insertion sort. This improves the both
   asymptotic and observed performance on sorting tasks.
 
-## UI Improvements
+## UI improvements
 
 * "Type mismatch" errors now show a context giving more information
   about the location of the error.   The context is shown when the
@@ -16,6 +16,26 @@
   and the context will be `{ b : [ERROR] _ }` indicating that the
   error is in the length of the sequence of field `b`.
 
+## Bug fixes
+
+* The What4 backend now properly supports Boolector 3.2.2 or later.
+
+* Make error message locations more precise in some cases (issue #1299).
+
+* Make `:reload` behave as expected after loading a module with `:module`
+  (issue #1313).
+
+* Make `include` paths work as expected when nested within another `include`
+  (issue #1321).
+
+* Fix a panic that occurred when loading dependencies before `include`s are
+  resolved (issue #1330).
+
+* Closed issues #1098, #1280, and #1347.
+
+* Merged pull requests #1233, #1300, #1301, #1302, #1303, #1305, #1306, #1307,
+  #1308, #1311, #1312, #1317, #1319, #1323, #1326, #1331, #1333, #1336, #1337,
+  #1338, #1342, #1346, #1348, and #1349.
 
 # 2.12.0
 
@@ -62,7 +82,7 @@
   can be combined into a single line by separating them with `;`,
   which is necessary for stating a signature together with a
   definition, etc.
-  
+
 * There is a new `:set path` REPL option that provides an alternative to
   `CRYPTOLPATH` for controlling where to search for imported modules
   (issue #631).

diff --git a/README.md b/README.md
@@ -75,6 +75,7 @@ Cryptol builds and runs on various flavors of Linux, Mac OS X, and
 Windows. We regularly build and test it in the following environments:
 
 - macOS 10.15, 64-bit
+- Ubuntu 18.04, 64-bit
 - Ubuntu 20.04, 64-bit
 - Windows Server 2019, 64-bit
 

diff --git a/cryptol-remote-api/CHANGELOG.md b/cryptol-remote-api/CHANGELOG.md
@@ -1,8 +1,10 @@
 # Revision history for `cryptol-remote-api` and `cryptol-eval-server`
 
-## 2.12.2 -- YYYY-MM-DD
+## 2.13.0 -- YYYY-MM-DD
 
-* NEW CHANGELOG ENTRIES SINCE 2.12.0 GO HERE
+* v2.13.0 release in tandem with the Cryptol 2.13.0 release. See the Cryptol
+  2.13.0 release notes for relevant Cryptol changes. No notable changes to the
+  RPC server or client since 2.12.0.
 
 ## 2.12.0 -- 2021-11-19
 

diff --git a/cryptol-remote-api/python/CHANGELOG.md b/cryptol-remote-api/python/CHANGELOG.md
@@ -1,9 +1,11 @@
 # Revision history for `cryptol` Python package
 
 
-## 2.12.6 -- YYYY-MM-DD
+## 2.13.0 -- YYYY-MM-DD
 
-* NEW CHANGELOG ENTRIES SINCE 2.12.4 GO HERE
+* v2.13.0 release in tandem with the Cryptol 2.13.0 release. See the Cryptol
+  2.13.0 release notes for relevant Cryptol changes. No notable changes to the
+  RPC server or client since 2.12.4.
 
 ## 2.12.4 -- 2022-03-21