From a08ffef44fc1cefa83b045c63daaea3976cf8c8e Mon Sep 17 00:00:00 2001
From: Jens Petersen <juhpetersen@gmail.com>
Date: Wed, 29 Jan 2025 17:26:04 +0800
Subject: [PATCH] image: use awscli-2.22 to avoid r2/s3 upload issues with 2.23

fixes https://github.com/haskellfoundation/hf-infrastructure/issues/11
---
 automated/build.sh        |  6 ------
 build-constraints.yaml    | 14 +++++++-------
 docker/01-build-server.sh |  4 +++-
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/automated/build.sh b/automated/build.sh
index d5508889..2c8da833 100755
--- a/automated/build.sh
+++ b/automated/build.sh
@@ -33,13 +33,7 @@ else
 fi
 WORKDIR=$ROOT/work/$TAG
 
-if [ $SHORTNAME = "lts" ]
-then
 IMAGE=ghcr.io/commercialhaskell/stackage/build:$TAG
-else
-# workaround https://github.com/haskellfoundation/hf-infrastructure/issues/11
-IMAGE=ghcr.io/commercialhaskell/stackage/build@sha256:885c67138c034bbba4b5538faeaefc1eac0260f396fed446c11102f7d902f9cb
-fi
 
 docker pull $IMAGE
 
diff --git a/build-constraints.yaml b/build-constraints.yaml
index 1ea9063c..63cf41df 100644
--- a/build-constraints.yaml
+++ b/build-constraints.yaml
@@ -3449,18 +3449,18 @@ packages:
         - gi-pango
         - gi-xlib
         - gi-harfbuzz
-        - gi-gtksource < 0 # gi-gtksource5
+        - gi-gtksource
         - gi-gtksource3
-        - gi-gtksource5 < 0 # blocked by https://github.com/haskellfoundation/hf-infrastructure/issues/11
-        - gi-javascriptcore < 0 # gi-javascriptcore6
-        - gi-javascriptcore4 < 0 # blocked by https://github.com/haskellfoundation/hf-infrastructure/issues/11
-        - gi-javascriptcore6 < 0 # blocked by https://github.com/haskellfoundation/hf-infrastructure/issues/11
+        - gi-gtksource5
+        - gi-javascriptcore
+        - gi-javascriptcore4
+        - gi-javascriptcore6
         - gi-vte
         - gi-webkit2
         - gi-freetype2
-        - gi-soup < 0 # gi-soup3
+        - gi-soup
         - gi-soup2
-        - gi-soup3 < 0 # blocked by https://github.com/haskellfoundation/hf-infrastructure/issues/11
+        - gi-soup3
 
     "Brandon Simmons <brandon.m.simmons@gmail.com> @jberryman":
         - directory-tree
diff --git a/docker/01-build-server.sh b/docker/01-build-server.sh
index 3a0fb66e..ace59fa7 100755
--- a/docker/01-build-server.sh
+++ b/docker/01-build-server.sh
@@ -16,7 +16,9 @@ apt-get install -y curl unzip
 mkdir -p /tmp/awscli
 (
 cd /tmp/awscli
-curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
+# use 2.22.35 to workaround upload errors with 2.23:
+# see https://github.com/haskellfoundation/hf-infrastructure/issues/11
+curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.22.35.zip" -o "awscliv2.zip"
 unzip -q awscliv2.zip
 ./aws/install --bin-dir /usr/bin
 )