Skip to content

Commit

Permalink
Merge pull request #1233 from GaloisInc/ghc9
Browse files Browse the repository at this point in the history
GHC 9.*
  • Loading branch information
RyanGlScott authored Jan 25, 2022
2 parents 34404d7 + 3892615 commit 413788c
Show file tree
Hide file tree
Showing 25 changed files with 983 additions and 936 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
workflow_dispatch:

env:
SOLVER_PKG_VERSION: "snapshot-20210917"
SOLVER_PKG_VERSION: "snapshot-20220114"

jobs:
config:
Expand Down Expand Up @@ -52,13 +52,13 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
ghc-version: ["8.6.5", "8.8.4", "8.10.2"]
ghc-version: ["8.8.4", "8.10.7", "9.0.2"]
exclude:
# https://gitlab.haskell.org/ghc/ghc/-/issues/18550
- os: windows-latest
ghc-version: 8.8.4
ghc-version: 8.10.7
- os: windows-latest
ghc-version: 8.10.2
ghc-version: 9.0.2
outputs:
test-lib-json: ${{ steps.test-lib.outputs.targets-json }}
env:
Expand Down Expand Up @@ -186,13 +186,13 @@ jobs:
if-no-files-found: error
retention-days: ${{ needs.config.outputs.retention-days }}

- if: matrix.ghc-version == '8.6.5'
- if: matrix.ghc-version == '8.8.4'
uses: actions/upload-artifact@v2
with:
path: dist/bin
name: ${{ runner.os }}-dist-bin

- if: matrix.ghc-version == '8.6.5'
- if: matrix.ghc-version == '8.8.4'
uses: actions/upload-artifact@v2
with:
path: bin
Expand Down Expand Up @@ -236,7 +236,7 @@ jobs:

- uses: haskell/actions/setup@v1
with:
ghc-version: '8.10.3'
ghc-version: '8.10.7'

- if: matrix.suite == 'rpc'
uses: actions/setup-python@v2
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,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.6.5, 8.8.4, and
8.10.2. The easiest way to install an approporiate version of GHC is
versions of GHC, which at the time of this writing are 8.8.4, 8.10.7, and
9.0.2. The easiest way to install an approporiate version of GHC is
with [ghcup](https://www.haskell.org/ghcup/).

Some supporting non-Haskell libraries are required to build
Expand Down
228 changes: 0 additions & 228 deletions cabal.GHC-8.10.2.config

This file was deleted.

Loading

0 comments on commit 413788c

Please sign in to comment.