Drop support for GHC 8.6 (#950)

Now that `crucible` supports GHC 9.0, it's about time to drop support for 8.6, as we generally only support the previous three stable releases of GHC (in this case, that would be 8.8, 8.10, and 9.0). As a result, lots of 8.6–specific CPP can be removed. I have updated the version bounds of affected packages accordingly.
GaloisInc · Jan 10, 2022 · 5179065 · 5179065
1 parent be3d315
commit 5179065
Show file tree

Hide file tree

Showing 32 changed files with 37 additions and 670 deletions.
diff --git a/.github/workflows/crucible-go-build.yml b/.github/workflows/crucible-go-build.yml
@@ -28,12 +28,9 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest] # , macos-10.15] # , windows-latest]
-        ghc: ["8.6.5", "8.8.4", "8.10.7", "9.0.2"]
+        ghc: ["8.8.4", "8.10.7", "9.0.2"]
         allow-failure: [false]
         include:
-          - os: macos-10.15
-            ghc: 8.6.5
-            allow-failure: true
           - os: macos-10.15
             ghc: 8.8.4
             allow-failure: true
@@ -89,7 +86,6 @@ jobs:
         run: |
           GHC=haskell.compiler.ghc$(echo ${{ matrix.ghc }} | sed -e s,\\.,,g)
           case ${{ matrix.ghc }} in
-            8.6.5) GHC_NIXPKGS=github:nixos/nixpkgs/20.09 ;;
             9.0.2) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
             *)     GHC_NIXPKGS=github:nixos/nixpkgs/21.11 ;;
           esac

diff --git a/.github/workflows/crucible-jvm-build.yml b/.github/workflows/crucible-jvm-build.yml
@@ -28,12 +28,9 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest] # , macos-10.15] # , windows-latest]
-        ghc: ["8.6.5", "8.8.4", "8.10.7", "9.0.2"]
+        ghc: ["8.8.4", "8.10.7", "9.0.2"]
         allow-failure: [false]
         include:
-          - os: macos-10.15
-            ghc: 8.6.5
-            allow-failure: true
           - os: macos-10.15
             ghc: 8.8.4
             allow-failure: true
@@ -89,7 +86,6 @@ jobs:
         run: |
           GHC=haskell.compiler.ghc$(echo ${{ matrix.ghc }} | sed -e s,\\.,,g)
           case ${{ matrix.ghc }} in
-            8.6.5) GHC_NIXPKGS=github:nixos/nixpkgs/20.09 ;;
             9.0.2) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
             *)     GHC_NIXPKGS=github:nixos/nixpkgs/21.11 ;;
           esac

diff --git a/.github/workflows/crucible-wasm-build.yml b/.github/workflows/crucible-wasm-build.yml
@@ -28,12 +28,9 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest] # , macos-10.15] # , windows-latest]
-        ghc: ["8.6.5", "8.8.4", "8.10.7", "9.0.2"]
+        ghc: ["8.8.4", "8.10.7", "9.0.2"]
         allow-failure: [false]
         include:
-          - os: macos-10.15
-            ghc: 8.6.5
-            allow-failure: true
           - os: macos-10.15
             ghc: 8.8.4
             allow-failure: true
@@ -89,7 +86,6 @@ jobs:
         run: |
           GHC=haskell.compiler.ghc$(echo ${{ matrix.ghc }} | sed -e s,\\.,,g)
           case ${{ matrix.ghc }} in
-            8.6.5) GHC_NIXPKGS=github:nixos/nixpkgs/20.09 ;;
             9.0.2) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
             *)     GHC_NIXPKGS=github:nixos/nixpkgs/21.11 ;;
           esac

diff --git a/.github/workflows/crux-llvm-build.yml b/.github/workflows/crux-llvm-build.yml
@@ -45,12 +45,9 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04, ubuntu-18.04] # , macos-10.15] # , windows-latest]
-        ghc: ["8.6.5", "8.8.4", "8.10.7", "9.0.2"]
+        ghc: ["8.8.4", "8.10.7", "9.0.2"]
         allow-failure: [false]
         include:
-          - os: macos-10.15
-            ghc: 8.6.5
-            allow-failure: true
           - os: macos-10.15
             ghc: 8.8.4
             allow-failure: true
@@ -106,7 +103,6 @@ jobs:
         run: |
           GHC=haskell.compiler.ghc$(echo ${{ matrix.ghc }} | sed -e s,\\.,,g)
           case ${{ matrix.ghc }} in
-            8.6.5) GHC_NIXPKGS=github:nixos/nixpkgs/20.09 ;;
             9.0.2) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
             *)     GHC_NIXPKGS=github:nixos/nixpkgs/21.11 ;;
           esac

diff --git a/.github/workflows/crux-mir-build.yml b/.github/workflows/crux-mir-build.yml
@@ -42,7 +42,7 @@ jobs:
       matrix:
         # We want Windows soon, but it doesn't need to be now
         os: [ubuntu-latest, macos-10.15] #, windows-latest]
-        ghc: ["8.6.5", "8.8.4", "8.10.7", "9.0.2"]
+        ghc: ["8.8.4", "8.10.7", "9.0.2"]
         # Windows only seems to work on 8.6.5. Others result in
         # segfaults or other internal errors.
         exclude:
@@ -96,7 +96,6 @@ jobs:
         run: |
           GHC=haskell.compiler.ghc$(echo ${{ matrix.ghc }} | sed -e s,\\.,,g)
           case ${{ matrix.ghc }} in
-            8.6.5) GHC_NIXPKGS=github:nixos/nixpkgs/20.09 ;;
             9.0.2) GHC_NIXPKGS=github:nixos/nixpkgs/nixos-unstable ;;
             *)     GHC_NIXPKGS=github:nixos/nixpkgs/21.11 ;;
           esac