From 7d81953e7d7ad9e23aed82eada829a20bd5750d6 Mon Sep 17 00:00:00 2001
From: Ryan Scott <ryan.gl.scott@gmail.com>
Date: Tue, 16 Apr 2024 07:47:28 -0400
Subject: [PATCH] CI: Test GHC 9.10, drop GHC 9.4
---
README.md | 2 +-
ci/config.sh | 21 ++++++++-------------
ci/pipelines/validation.yml | 2 +-
3 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/README.md b/README.md
index 7400a1e3..a9959ef1 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ existing Hackage package(s).
you submit a PR).
- The patches SHOULD work with at least GHC HEAD and a set of recent stable
- released GHC versions (currently this means with GHC 9.4, 9.6, 9.8, and 9.9).
+ released GHC versions (currently this means with GHC 9.6, 9.8, 9.10, and 9.11).
- The patches SHOULD ideally result in the same code being compiled,
as one of the main purposes of these patches is to make regression
diff --git a/ci/config.sh b/ci/config.sh
index 7f4335ce..fe45ad7a 100644
--- a/ci/config.sh
+++ b/ci/config.sh
@@ -88,12 +88,6 @@ commit="$(ghc_commit)"
arch="$(ghc_arch)"
echo "Found GHC $version, commit $commit."
case $version in
- 9.4.*)
- # package ticket
- broken linear-generics 22546
- broken liquidhaskell-boot 350
- ;;
-
9.6.*)
# package ticket
broken liquidhaskell-boot 350
@@ -104,8 +98,9 @@ case $version in
broken liquidhaskell-boot 350
;;
- 9.9.*)
+ 9.10.*)
# package ticket
+ broken liquidhaskell-boot 350
;;
9.11.*)
@@ -221,13 +216,13 @@ case "$BUILD_MODE" in
test_package bytestring-tests "$(pwd)/../tests/bytestring"
test_package all "$(pwd)/../tests/containers/containers-tests"
case $version in
- 9.4.*)
- ;;
9.6.*)
;;
9.8.*)
;;
- 9.9.*)
+ 9.10.*)
+ ;;
+ 9.11.*)
test_package liquidhaskell-boot "$(pwd)/../tests/liquidhaskell/liquidhaskell-boot"
;;
*)
@@ -238,13 +233,13 @@ case "$BUILD_MODE" in
test_package system-test "$(pwd)/../tests/ghc-debug/**/*.cabal"
test_package ghc-tests "$(pwd)/../tests/ghc-tests"
case $version in
- 9.4.*)
- ;;
9.6.*)
;;
9.8.*)
;;
- 9.9.*)
+ 9.10.*)
+ ;;
+ 9.11.*)
test_package liquidhaskell-boot "$(pwd)/../tests/liquidhaskell/liquidhaskell-boot"
;;
*)
diff --git a/ci/pipelines/validation.yml b/ci/pipelines/validation.yml
index 94e117cf..83396c30 100644
--- a/ci/pipelines/validation.yml
+++ b/ci/pipelines/validation.yml
@@ -14,7 +14,7 @@ stages:
extends: .run-ci
parallel:
matrix:
- - UPSTREAM_BRANCH_NAME: [ghc-9.4, ghc-9.6, ghc-9.8]
+ - UPSTREAM_BRANCH_NAME: [ghc-9.6, ghc-9.8, ghc-9.10]
ARCH: [aarch64, x86_64]
- UPSTREAM_BRANCH_NAME: [master]
ARCH: [aarch64, x86_64]
--
GitLab