From 7858bba45950eeaae25a82b63aa9e1d6763f0a38 Mon Sep 17 00:00:00 2001 From: brandon s allbery kf8nh Date: Tue, 30 Sep 2025 17:28:23 -0400 Subject: [PATCH 1/2] fix network-uri bound Someone (I won't claim it wasn't me) swapped digit in the dependency for cabal-install. But it's correct for the later tests, which makes me think it was a typo. (cherry picked from commit 3ddd060207b54b8b38871201823fc141fce80044) --- cabal-install/cabal-install.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal index 35377d321ea..97edde7609e 100644 --- a/cabal-install/cabal-install.cabal +++ b/cabal-install/cabal-install.cabal @@ -245,7 +245,7 @@ library , filepath >= 1.4.0.0 && < 1.6 , HTTP >= 4000.1.5 && < 4000.5 , mtl >= 2.0 && < 2.4 - , network-uri >= 2.6.0.2 && < 2.7 + , network-uri >= 2.6.2.0 && < 2.7 , pretty >= 1.1 && < 1.2 , process >= 1.2.3.0 && < 1.7 , random >= 1.2 && < 1.4 From 725b1a9d8723dc37edddb4aa90e9993f97e02c6f Mon Sep 17 00:00:00 2001 From: Bryan Richter Date: Thu, 11 Sep 2025 16:41:03 +0300 Subject: [PATCH 2/2] Use today's ci-images build; move to alpine3_22 (cherry picked from commit e063b3e7c00e6e5db6ab1c6503f60d77f6323caa) --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4657457baad..2afe14bdcbe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,7 @@ stages: variables: # Commit of ghc/ci-images repository from which to pull Docker images - DOCKER_REV: "df20b2eb2fcc1c93aed5ad047c65752fbd4c38d4" + DOCKER_REV: "be4ac2cd18f38e63b263e2a27c76a7c279385796" GHC_VERSION: 9.10.2 CABAL_INSTALL_VERSION: 3.14.2.0 @@ -67,13 +67,13 @@ alpine-linux: parallel: matrix: - ARCH: [x86_64] - OS: [alpine3_12, alpine3_20] + OS: [alpine3_12, alpine3_22] TAG: x86_64-linux - ARCH: [i386] - OS: alpine3_20 + OS: alpine3_22 TAG: x86_64-linux - ARCH: [aarch64] - OS: [alpine3_18] + OS: [alpine3_22] TAG: aarch64-linux tags: - $TAG