Merge pull request #8470 from Mikolaj/disable-8.0.2-on-3.8

drop ci support for GHC 8.0.2
haskell · Sep 14, 2022 · beb538e · beb538e
2 parents 3b11fef + 2059ced
commit beb538e
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 86 deletions.
diff --git a/.docker/validate-8.0.2.dockerfile b/.docker/validate-8.0.2.dockerfile
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -38,7 +38,7 @@ jobs:
     strategy:
       matrix:
         os: ["ubuntu-latest", "macos-latest", "windows-latest"]
-        ghc: ["9.2.3", "9.0.2", "8.10.7", "8.8.4", "8.6.5", "8.4.4", "8.0.2"]
+        ghc: ["9.2.3", "9.0.2", "8.10.7", "8.8.4", "8.6.5", "8.4.4"]
         exclude:
           # corrupts GHA cache or the fabric of reality itself, see https://github.com/haskell/cabal/issues/8356
           - os: "windows-latest"
@@ -48,16 +48,6 @@ jobs:
             ghc: "8.8.4"
           - os: "windows-latest"
             ghc: "8.4.4"
-        include:
-          - os: "ubuntu-latest"
-            ghc: "8.0.2"
-            cli: "false"
-          - os: "macos-latest"
-            ghc: "8.0.2"
-            cli: "false"
-          - os: "windows-latest"
-            ghc: "8.0.2"
-            cli: "false"
 
     steps:
 

diff --git a/Makefile b/Makefile
@@ -126,7 +126,6 @@ cabal-install-test-accept:
 #
 #   make validate-via-docker-all -j4 -O
 #
-validate-via-docker-all : validate-via-docker-8.0.2
 validate-via-docker-all : validate-via-docker-8.2.2
 validate-via-docker-all : validate-via-docker-8.4.4
 validate-via-docker-all : validate-via-docker-8.6.5
@@ -147,9 +146,6 @@ validate-dockerfiles : .docker/validate-8.6.5.dockerfile
 # and we have a test relying on this limit being sufficiently small
 DOCKERARGS:=--ulimit nofile=1024:1024
 
-validate-via-docker-8.0.2:
-	docker build $(DOCKERARGS) -t cabal-validate:8.0.2 -f .docker/validate-8.0.2.dockerfile .
-
 validate-via-docker-8.2.2:
 	docker build $(DOCKERARGS) -t cabal-validate:8.2.2 -f .docker/validate-8.2.2.dockerfile .
 

diff --git a/cabal-dev-scripts/src/GenValidateDockerfile.hs b/cabal-dev-scripts/src/GenValidateDockerfile.hs
@@ -45,7 +45,6 @@ params = Map.fromList
     , pair "8.6.5"  $ Z "ghc-8.6.5"  "8.6.5-bionic"  False True  False True  ""
     , pair "8.4.4"  $ Z "ghc-8.4.4"  "8.4.4-bionic"  False True  False True  ""
     , pair "8.2.2"  $ Z "ghc-8.2.2"  "8.2.2-bionic"  True  True  False True  ""
-    , pair "8.0.2"  $ Z "ghc-8.0.2"  "8.0.2-bionic"  True  True  False True  ""
     ]
   where
     pair = (,)

diff --git a/cabal-install/tests/UnitTests/Distribution/Client/Init/Utils.hs b/cabal-install/tests/UnitTests/Distribution/Client/Init/Utils.hs
@@ -67,7 +67,6 @@ baseVersion' "8.8.4"  = [4,13,0,0]
 baseVersion' "8.6.5"  = [4,12,0,0]
 baseVersion' "8.4.4"  = [4,11,1,0]
 baseVersion' "8.2.2"  = [4,10,1,0]
-baseVersion' "8.0.2"  = [4,10,0,0]
 baseVersion' "7.10.3" = [4,9,0,0]
 baseVersion' "7.8.4"  = [4,8,0,0]
 baseVersion' "7.6.3"  = [4,7,0,0]