From bd998cefeb707b8dba65500960adc8d23a9be44d Mon Sep 17 00:00:00 2001
From: Musab Guma'a <musabgumaa@gmail.com>
Date: Fri, 22 Jul 2022 11:45:07 +0000
Subject: [PATCH] drop ci support for GHC 8.0.2
---
.docker/validate-8.0.2.dockerfile | 69 -------------------
.github/workflows/validate.yml | 12 +---
.../Distribution/Utils/Structured.hs | 2 +-
Makefile | 4 --
.../src/GenValidateDockerfile.hs | 1 -
.../Distribution/Client/Init/Utils.hs | 1 -
6 files changed, 2 insertions(+), 87 deletions(-)
delete mode 100644 .docker/validate-8.0.2.dockerfile
diff --git a/.docker/validate-8.0.2.dockerfile b/.docker/validate-8.0.2.dockerfile
deleted file mode 100644
index aab9315c69..0000000000
--- a/.docker/validate-8.0.2.dockerfile
+++ /dev/null
@@ -1,69 +0,0 @@
-FROM phadej/ghc:8.0.2-bionic
-
-# Install cabal-plan
-RUN mkdir -p /root/.cabal/bin && \
- curl -L https://github.com/haskell-hvr/cabal-plan/releases/download/v0.6.2.0/cabal-plan-0.6.2.0-x86_64-linux.xz > cabal-plan.xz && \
- echo "de73600b1836d3f55e32d80385acc055fd97f60eaa0ab68a755302685f5d81bc cabal-plan.xz" | sha256sum -c - && \
- xz -d < cabal-plan.xz > /root/.cabal/bin/cabal-plan && \
- rm -f cabal-plan.xz && \
- chmod a+x /root/.cabal/bin/cabal-plan
-
-
-# Update index
-RUN cabal v2-update --index-state="2020-06-12T23:36:15Z"
-
-# We install happy, so it's in the store; we (hopefully) don't use it directly.
-RUN cabal v2-install happy --constraint 'happy ^>=1.19.12'
-
-# Install some other dependencies
-# Remove $HOME/.ghc so there aren't any environments
-RUN cabal v2-install -w ghc-8.0.2 --lib \
- Cabal \
- aeson \
- async \
- base-compat \
- base16-bytestring \
- base64-bytestring \
- cryptohash-sha256 \
- Diff \
- echo \
- ed25519 \
- edit-distance \
- HTTP \
- lukko \
- network \
- optparse-applicative \
- pretty-show \
- regex-compat-tdfa \
- regex-posix \
- regex-tdfa \
- rere \
- statistics \
- tar \
- tasty \
- tasty-golden \
- tasty-hunit \
- tasty-quickcheck \
- tree-diff \
- void \
- zlib \
- resolv \
- --constraint="rere -rere-cfg" \
- --constraint="these -assoc" \
- --constraint="bytestring installed" \
- --constraint="binary installed" \
- --constraint="containers installed" \
- --constraint="deepseq installed" \
- --constraint="directory installed" \
- --constraint="filepath installed" \
- --constraint="pretty installed" \
- --constraint="process installed" \
- --constraint="time installed" \
- --constraint="unix installed" \
- --constraint="transformers installed" \
- && rm -rf $HOME/.ghc
-
-# Validate
-WORKDIR /build
-COPY . /build
-RUN sh ./validate.sh -w ghc-8.0.2 -v
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index e47727ec69..3401a20a92 100644
--- 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:
# lot of segfaults caused by ghc bugs
- os: "windows-latest"
@@ -49,16 +49,6 @@ jobs:
# it often randomly does "C:\Users\RUNNER~1\AppData\Local\Temp\ghcFEDE.c: DeleteFile "\\\\?\\C:\\Users\\RUNNER~1\\AppData\\Local\\Temp\\ghcFEDE.c": permission denied (Access is denied.)"
- os: "windows-latest"
ghc: "8.6.5"
- 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/Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs b/Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs
index 56be131a9f..bbf5481da5 100644
--- a/Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs
+++ b/Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs
@@ -29,7 +29,7 @@ tests = testGroup "Distribution.Utils.Structured"
, testCase "GenericPackageDescription" $
md5Check (Proxy :: Proxy GenericPackageDescription) 0xaf3d4c667a8f019c98a45451419ad71c
, testCase "LocalBuildInfo" $
- md5Check (Proxy :: Proxy LocalBuildInfo) 0x6d132d3f99c869b678468256f24b6241
+ md5Check (Proxy :: Proxy LocalBuildInfo) 0x8ef5a39cb640e4340cf5c43a8300ff94
#endif
]
diff --git a/Makefile b/Makefile
index 831e4aa5e4..39ca47756c 100644
--- 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
index c5a5c0c7cd..10041b7cc5 100644
--- 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
index 2fa5b12195..e65bb15ab9 100644
--- 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]
--
GitLab