From 9fc26070b1bc845cc4146259fe8c56e051bdade7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20L=C3=A4ndle?= <969523+alaendle@users.noreply.github.com> Date: Mon, 19 Jan 2026 19:02:33 +0100 Subject: [PATCH] Revert to stack 3.7.1 and curator build with lts-22.43 (#7933). --- automated/build.sh | 4 ++-- automated/dockerfiles/lts-24.12/Dockerfile | 1 - docker/01-build-server.sh | 2 +- etc/check.sh | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/automated/build.sh b/automated/build.sh index f6e17647..73e42a5d 100755 --- a/automated/build.sh +++ b/automated/build.sh @@ -80,10 +80,10 @@ BINDIR=$(cd $ROOT/work/bin ; pwd) cd $BINDIR rm -f curator stack -- *.bz2 -curl -L "https://github.com/commercialhaskell/curator/releases/download/commit-94bf97ad57e03993b8c57a8c4750ea1d00507f68/curator.bz2" | bunzip2 > curator +curl -L "https://github.com/commercialhaskell/curator/releases/download/commit-9b711e4c71f730cf2ba02cf928882486b27b65a5/curator.bz2" | bunzip2 > curator chmod +x curator -STACK_VERSION=3.9.1 +STACK_VERSION=3.7.1 # rc url #curl -L https://github.com/commercialhaskell/stack/releases/download/rc%2Fv${STACK_VERSION}/stack-${STACK_VERSION}-linux-x86_64-bin > stack curl -L https://github.com/commercialhaskell/stack/releases/download/v${STACK_VERSION}/stack-${STACK_VERSION}-linux-x86_64-bin > stack diff --git a/automated/dockerfiles/lts-24.12/Dockerfile b/automated/dockerfiles/lts-24.12/Dockerfile index c0399c1d..c078871b 100644 --- a/automated/dockerfiles/lts-24.12/Dockerfile +++ b/automated/dockerfiles/lts-24.12/Dockerfile @@ -6,7 +6,6 @@ ARG GHC_VERSION=9.10.3 ARG LTS_SLUG=lts-24.12 # update to 0.1.3.1 for lts-25 ARG PID1_VERSION=0.1.2.0 -# update to 3.9.1 for lts-25 ARG STACK_VERSION=3.7.1 ARG CUDA_VERSION=10.0 ARG JVM_PATH=/usr/lib/jvm/java-8-openjdk-amd64 diff --git a/docker/01-build-server.sh b/docker/01-build-server.sh index f837e474..46d23840 100755 --- a/docker/01-build-server.sh +++ b/docker/01-build-server.sh @@ -24,6 +24,6 @@ unzip -q awscliv2.zip ) rm -rf /tmp/awscli -STACK_VERSION=3.9.1 +STACK_VERSION=3.7.1 curl -L https://github.com/commercialhaskell/stack/releases/download/v${STACK_VERSION}/stack-${STACK_VERSION}-linux-x86_64-bin > /usr/bin/stack chmod +x /usr/bin/stack diff --git a/etc/check.sh b/etc/check.sh index 0efced29..b09a4987 100755 --- a/etc/check.sh +++ b/etc/check.sh @@ -11,7 +11,7 @@ export PATH=$HOME/.local/bin:$PATH curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack' # Get new Stackage curator -curl -L "https://github.com/commercialhaskell/curator/releases/download/commit-94bf97ad57e03993b8c57a8c4750ea1d00507f68/curator.bz2" | bunzip2 > curator +curl -L "https://github.com/commercialhaskell/curator/releases/download/commit-9b711e4c71f730cf2ba02cf928882486b27b65a5/curator.bz2" | bunzip2 > curator chmod +x curator # Install GHC